From fcd7d8d534b80cc9d6dc5edc6d8ac2ecc36bd685 Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Sat, 24 May 2025 14:18:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E6=83=A0=E5=88=B8=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BF=AE=E5=A4=8D=202=E3=80=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BF=AE=E5=A4=8D=203=E3=80=81=E5=9B=A2?= =?UTF-8?q?=E9=95=BF=E6=A8=A1=E5=9D=97=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/pay/MpWxPayService.java | 4 +- .../controller/TeambuyCouponController.java | 2 +- .../teambuyCoupon/entity/TeambuyCoupon.java | 9 +- .../teambuyCoupon/mapper/TeambuyCouponMapper.java | 2 +- .../service/ITeambuyCouponService.java | 2 +- .../service/impl/TeambuyCouponServiceImpl.java | 2 +- .../teambuyCoupon/vue/TeambuyCouponList.vue | 11 +- .../vue/modules/TeambuyCouponForm.vue | 7 +- .../teambuyCoupon/vue3/TeambuyCoupon.data.ts | 17 +- .../controller/TeambuyCouponUserController.java | 2 +- .../entity/TeambuyCouponUser.java | 4 +- .../mapper/TeambuyCouponUserMapper.java | 2 +- .../service/ITeambuyCouponUserService.java | 2 +- .../service/impl/TeambuyCouponUserServiceImpl.java | 2 +- .../vue/TeambuyCouponUserList.vue | 2 +- .../vue/modules/TeambuyCouponUserForm.vue | 2 +- .../vue3/TeambuyCouponUser.data.ts | 2 +- .../controller/TeambuyOrderMemberController.java | 2 +- .../entity/TeambuyOrderMember.java | 6 +- .../mapper/TeambuyOrderMemberMapper.java | 2 +- .../service/ITeambuyOrderMemberService.java | 2 +- .../impl/TeambuyOrderMemberServiceImpl.java | 2 +- .../vue/TeambuyOrderMemberList.vue | 6 + .../vue/modules/TeambuyOrderMemberForm.vue | 5 + .../vue3/TeambuyOrderMember.data.ts | 10 ++ .../entity/TeambuyTeamLeader.java | 5 + .../api/teambuyController/CouponController.java | 27 ++- .../api/teambuyController/LeaderController.java | 7 + .../api/teambuyController/OrderController.java | 4 +- .../jeecg/modules/apiService/CouponService.java | 13 ++ .../jeecg/modules/apiService/LeaderService.java | 2 + .../org/jeecg/modules/apiService/OrderService.java | 6 +- .../modules/apiService/impl/CouponServiceImpl.java | 135 ++++++++++++++- .../modules/apiService/impl/LeaderServiceImpl.java | 75 +++++++-- .../modules/apiService/impl/OrderServiceImpl.java | 186 +++++++++++++-------- 35 files changed, 443 insertions(+), 126 deletions(-) diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index 8cea047..b3ed06f 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -99,13 +99,13 @@ public class MpWxPayService { request.setTotalFee(price); //总金额|分计 request.setSpbillCreateIp(clientIp); //终端IP // request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 - request.setNotifyUrl("http://augcl.natapp1.cc/teambuy-api/teambuy/order/payOrderNotify");//设置回调路径 + request.setNotifyUrl("https://www.gwrx666.com/teambuy-api//teambuy/order/payOrderNotify");//设置回调路径 request.setProductId(productId); //商品id request.setOpenid(openId); //JSAPI OPENID if (dev){ request.setTotalFee(price); // request.setNotifyUrl(wxPay.notifyUrlDev); - request.setNotifyUrl("http://augcl.natapp1.cc/teambuy-api/teambuy/order/payOrderNotify");//设置回调路径 + request.setNotifyUrl("https://www.gwrx666.com/teambuy-api/teambuy/order/payOrderNotify");//设置回调路径 } try { Object order = wxPayService.createOrder(request); diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/controller/TeambuyCouponController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/controller/TeambuyCouponController.java index daee81e..b8ac977 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/controller/TeambuyCouponController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/controller/TeambuyCouponController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ @Api(tags="优惠券信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/entity/TeambuyCoupon.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/entity/TeambuyCoupon.java index 52edd03..9e4e9e9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/entity/TeambuyCoupon.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/entity/TeambuyCoupon.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ @Data @@ -52,7 +52,8 @@ public class TeambuyCoupon implements Serializable { @ApiModelProperty(value = "优惠券名称") private java.lang.String title; /**优惠券类型*/ - @Excel(name = "优惠券类型", width = 15) + @Excel(name = "优惠券类型", width = 15, dicCode = "teambuy_coupon_type") + @Dict(dicCode = "teambuy_coupon_type") @ApiModelProperty(value = "优惠券类型") private java.lang.String type; /**抵扣金额*/ @@ -67,4 +68,8 @@ public class TeambuyCoupon implements Serializable { @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") private java.lang.String remark; + /**是否可领取*/ + @Excel(name = "是否可领取", width = 15) + @ApiModelProperty(value = "是否可领取") + private java.lang.String isFetch; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/mapper/TeambuyCouponMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/mapper/TeambuyCouponMapper.java index 671da2e..3f17cad 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/mapper/TeambuyCouponMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/mapper/TeambuyCouponMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ public interface TeambuyCouponMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/ITeambuyCouponService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/ITeambuyCouponService.java index 9569995..a010b22 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/ITeambuyCouponService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/ITeambuyCouponService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ public interface ITeambuyCouponService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/impl/TeambuyCouponServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/impl/TeambuyCouponServiceImpl.java index 61240bd..1afb534 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/impl/TeambuyCouponServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/service/impl/TeambuyCouponServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/TeambuyCouponList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/TeambuyCouponList.vue index 79485d3..0f44f01 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/TeambuyCouponList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/TeambuyCouponList.vue @@ -99,6 +99,7 @@ import { mixinDevice } from '@/utils/mixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import TeambuyCouponModal from './modules/TeambuyCouponModal' + import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' export default { name: 'TeambuyCouponList', @@ -129,7 +130,7 @@ { title:'优惠券类型', align:"center", - dataIndex: 'type' + dataIndex: 'type_dictText' }, { title:'抵扣金额', @@ -146,6 +147,11 @@ align:"center", dataIndex: 'remark' }, + { + title:'是否可领取', + align:"center", + dataIndex: 'isFetch' + }, { title: '操作', dataIndex: 'action', @@ -181,10 +187,11 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'优惠券名称',dictCode:''}) - fieldList.push({type:'string',value:'type',text:'优惠券类型',dictCode:''}) + fieldList.push({type:'string',value:'type',text:'优惠券类型',dictCode:'teambuy_coupon_type'}) fieldList.push({type:'BigDecimal',value:'amount',text:'抵扣金额',dictCode:''}) fieldList.push({type:'datetime',value:'validDate',text:'有效期'}) fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''}) + fieldList.push({type:'string',value:'isFetch',text:'是否可领取',dictCode:'is_fetch'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/modules/TeambuyCouponForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/modules/TeambuyCouponForm.vue index 2e3774a..9d3159f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/modules/TeambuyCouponForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue/modules/TeambuyCouponForm.vue @@ -10,7 +10,7 @@ - + @@ -28,6 +28,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue3/TeambuyCoupon.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue3/TeambuyCoupon.data.ts index 158ab5f..ab6942f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue3/TeambuyCoupon.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCoupon/vue3/TeambuyCoupon.data.ts @@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [ { title: '优惠券类型', align:"center", - dataIndex: 'type' + dataIndex: 'type_dictText' }, { title: '抵扣金额', @@ -29,6 +29,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'remark' }, + { + title: '是否可领取', + align:"center", + dataIndex: 'isFetch' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -43,7 +48,10 @@ export const formSchema: FormSchema[] = [ { label: '优惠券类型', field: 'type', - component: 'Input', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"teambuy_coupon_type" + }, }, { label: '抵扣金额', @@ -60,4 +68,9 @@ export const formSchema: FormSchema[] = [ field: 'remark', component: 'Input', }, + { + label: '是否可领取', + field: 'isFetch', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/controller/TeambuyCouponUserController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/controller/TeambuyCouponUserController.java index 5c376c2..7067f20 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/controller/TeambuyCouponUserController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/controller/TeambuyCouponUserController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 用户优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ @Api(tags="用户优惠券信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/entity/TeambuyCouponUser.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/entity/TeambuyCouponUser.java index ca7e34c..52d934b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/entity/TeambuyCouponUser.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/entity/TeambuyCouponUser.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 用户优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ @Data @@ -50,7 +50,7 @@ public class TeambuyCouponUser implements Serializable { /**抵扣金额*/ @Excel(name = "抵扣金额", width = 15) @ApiModelProperty(value = "抵扣金额") - private java.lang.String discount; + private java.math.BigDecimal discount; /**有效期*/ @Excel(name = "有效期", width = 15) @ApiModelProperty(value = "有效期") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/mapper/TeambuyCouponUserMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/mapper/TeambuyCouponUserMapper.java index 7d2811b..1f2f405 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/mapper/TeambuyCouponUserMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/mapper/TeambuyCouponUserMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 用户优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ public interface TeambuyCouponUserMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/ITeambuyCouponUserService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/ITeambuyCouponUserService.java index 1ef013a..0ae743f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/ITeambuyCouponUserService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/ITeambuyCouponUserService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 用户优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ public interface ITeambuyCouponUserService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/impl/TeambuyCouponUserServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/impl/TeambuyCouponUserServiceImpl.java index 557a5f6..5f321c8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/impl/TeambuyCouponUserServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/service/impl/TeambuyCouponUserServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 用户优惠券信息表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-23 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/TeambuyCouponUserList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/TeambuyCouponUserList.vue index 95a15ee..6001b6b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/TeambuyCouponUserList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/TeambuyCouponUserList.vue @@ -181,7 +181,7 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'discount',text:'抵扣金额',dictCode:''}) + fieldList.push({type:'BigDecimal',value:'discount',text:'抵扣金额',dictCode:''}) fieldList.push({type:'datetime',value:'validDate',text:'有效期'}) fieldList.push({type:'string',value:'status',text:'使用状态',dictCode:'teambuy_coupon_status'}) fieldList.push({type:'string',value:'couponId',text:'关联优惠券id',dictCode:"teambuy_coupon,title,id"}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/modules/TeambuyCouponUserForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/modules/TeambuyCouponUserForm.vue index 89d15cc..c560baf 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/modules/TeambuyCouponUserForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue/modules/TeambuyCouponUserForm.vue @@ -5,7 +5,7 @@ - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue3/TeambuyCouponUser.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue3/TeambuyCouponUser.data.ts index 082caef..b19fcd5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue3/TeambuyCouponUser.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyCouponUser/vue3/TeambuyCouponUser.data.ts @@ -38,7 +38,7 @@ export const formSchema: FormSchema[] = [ { label: '抵扣金额', field: 'discount', - component: 'Input', + component: 'InputNumber', }, { label: '有效期', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java index 3d7b267..68b58bc 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/controller/TeambuyOrderMemberController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-14 + * @Date: 2025-05-23 * @Version: V1.0 */ @Api(tags="团员订单表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java index a44ce21..79c328a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/entity/TeambuyOrderMember.java @@ -26,7 +26,7 @@ import lombok.experimental.Accessors; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-14 + * @Date: 2025-05-23 * @Version: V1.0 */ @Data @@ -61,6 +61,10 @@ public class TeambuyOrderMember implements Serializable { @Excel(name = "订单总金额", width = 15) @ApiModelProperty(value = "订单总金额") private java.math.BigDecimal priceAll; + /**关联优惠券id*/ + @Excel(name = "关联优惠券id", width = 15) + @ApiModelProperty(value = "关联优惠券id") + private java.lang.String userCouponId; /**订单优惠金额*/ @Excel(name = "订单优惠金额", width = 15) @ApiModelProperty(value = "订单优惠金额") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java index caf6f0b..3f3d354 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/mapper/TeambuyOrderMemberMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-14 + * @Date: 2025-05-23 * @Version: V1.0 */ public interface TeambuyOrderMemberMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java index c27be1f..d513487 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/ITeambuyOrderMemberService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-14 + * @Date: 2025-05-23 * @Version: V1.0 */ public interface ITeambuyOrderMemberService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java index 84f7fba..1a650cf 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/service/impl/TeambuyOrderMemberServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 团员订单表 * @Author: jeecg-boot - * @Date: 2025-05-14 + * @Date: 2025-05-23 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue index 5d53ca2..a7c75b1 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/TeambuyOrderMemberList.vue @@ -132,6 +132,11 @@ align:"center", dataIndex: 'priceAll' }, + { + title:'关联优惠券id', + align:"center", + dataIndex: 'userCouponId' + }, { title:'订单优惠金额', align:"center", @@ -208,6 +213,7 @@ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'订单名称',dictCode:''}) fieldList.push({type:'BigDecimal',value:'priceAll',text:'订单总金额',dictCode:''}) + fieldList.push({type:'string',value:'userCouponId',text:'关联优惠券id',dictCode:''}) fieldList.push({type:'BigDecimal',value:'pricePreferential',text:'订单优惠金额',dictCode:''}) fieldList.push({type:'BigDecimal',value:'pricePay',text:'订单实付金额',dictCode:''}) fieldList.push({type:'datetime',value:'payTime',text:'付款时间'}) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue index 6935a52..48419cd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue/modules/TeambuyOrderMemberForm.vue @@ -13,6 +13,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts index 92ed703..fedbd26 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderMember/vue3/TeambuyOrderMember.data.ts @@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'priceAll' }, + { + title: '关联优惠券id', + align:"center", + dataIndex: 'userCouponId' + }, { title: '订单优惠金额', align:"center", @@ -70,6 +75,11 @@ export const formSchema: FormSchema[] = [ field: 'priceAll', component: 'InputNumber', }, + { + label: '关联优惠券id', + field: 'userCouponId', + component: 'Input', + }, { label: '订单优惠金额', field: 'pricePreferential', diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamLeader/entity/TeambuyTeamLeader.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamLeader/entity/TeambuyTeamLeader.java index 10753e2..56ab13d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamLeader/entity/TeambuyTeamLeader.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyTeamLeader/entity/TeambuyTeamLeader.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -93,4 +94,8 @@ public class TeambuyTeamLeader implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "关联用户") private java.lang.String userId; + + //团长信息 + @TableField(exist = false) + String bindStatus; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java index b61272b..4e5724c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/CouponController.java @@ -28,9 +28,34 @@ public class CouponController { private CouponService couponService; /******************************************************************************************************************/ //查看优惠券列表 - @ApiOperation(value="订单-查看优惠券列表/详情", notes="订单-查看优惠券列表/详情") + @ApiOperation(value="优惠券-查看我的优惠券列表/详情", notes="优惠券-查看我的优惠券列表/详情") @RequestMapping(value = "/queryCouponList", method = {RequestMethod.GET}) public Result queryCouponList(@RequestHeader("X-Access-Token") String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean){ return couponService.queryCouponList(token, teambuyCouponUser, pageBean); } + + //查看可领取的优惠券 + @ApiOperation(value="优惠券-查看可领取的优惠券", notes="优惠券-查看可领取的优惠券") + @RequestMapping(value = "/queryFetchCouponList", method = {RequestMethod.GET}) + public Result queryFetchCouponList(PageBean pageBean){ + return couponService.queryFetchCouponList(pageBean); + } + + //获取优惠券 + @ApiOperation(value="优惠券-领取优惠券", notes="优惠券-领取优惠券") + @RequestMapping(value = "/fetchCoupon", method = {RequestMethod.POST}) + public Result fetchCoupon(@RequestHeader("X-Access-Token") String token, String couponId){ + return couponService.fetchCoupon(token, couponId); + } + + //使用优惠券 + @ApiOperation(value="优惠券-使用优惠券", notes="优惠券-使用优惠券") + @RequestMapping(value = "/useCoupon", method = {RequestMethod.POST}) + public Result useCoupon(@RequestHeader("X-Access-Token") String token, String userCouponId){ + return couponService.useCoupon(token, userCouponId); + } + + + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/LeaderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/LeaderController.java index 64ae584..5bb1aa0 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/LeaderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/LeaderController.java @@ -41,6 +41,13 @@ public class LeaderController { return leaderService.deleteLeader(token, teamRelation); } + //取消解绑 + @ApiOperation(value="我的-取消解绑", notes="我的-取消解绑") + @RequestMapping(value = "/cancelDeleteLeader", method = {RequestMethod.POST}) + public Result cancelDeleteLeader(@RequestHeader("X-Access-Token") String token, TeambuyTeamRelation teamRelation){ + return leaderService.cancelDeleteLeader(token, teamRelation); + } + //更换团长 @ApiOperation(value="我的-更换团长", notes="我的-更换团长") @RequestMapping(value = "/updateLeader", method = {RequestMethod.POST}) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java index f06b967..f9f08e3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java @@ -103,8 +103,8 @@ public class OrderController { //创建订单 @ApiOperation(value="订单-创建订单", notes="支付方式(payType)：0-微信支付 1-余额支付") @RequestMapping(value = "/createOrder", method = {RequestMethod.POST}) - public Result createOrder(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss){ - return orderService.createOrder2(token, teambuyOrderMember, payType, leaderId, goodss); + public Result createOrder(@RequestHeader("X-Access-Token") String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss, String userCouponId){ + return orderService.createOrder2(token, teambuyOrderMember, payType, leaderId, goodss, userCouponId); } //修改团员订单状态 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java index 5e7ef02..844999b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CouponService.java @@ -1,10 +1,23 @@ package org.jeecg.modules.apiService; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.teambuyCouponUser.entity.TeambuyCouponUser; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; public interface CouponService { //查看优惠券列表 public Result queryCouponList(String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean); + + //查看可领取的优惠券 + public Result queryFetchCouponList(PageBean pageBean); + + //领取优惠券 + public Result fetchCoupon(String token, String couponId); + + //使用优惠券 + public Result useCoupon(String token, String userCouponId); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LeaderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LeaderService.java index 1bb3b26..53b826a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LeaderService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/LeaderService.java @@ -14,6 +14,8 @@ public interface LeaderService { public Result addLeader(String token, TeambuyTeamLeader teamLeader); //解绑团长 public Result deleteLeader(String token, TeambuyTeamRelation teamRelation); + //取消解绑 + public Result cancelDeleteLeader(String token, TeambuyTeamRelation teamRelation); //更换团长 public Result updateLeader(String token, TeambuyTeamRelation teamRelation); //查询团长信息 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java index 60b6dab..0d8ef26 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java @@ -33,10 +33,10 @@ public interface OrderService { public Result updateMemberOrderById(String token, TeambuyOrderMember teambuyOrderMember); //团员完成取餐 public Result finishMemberOrderById(String token, String memberOrderId); +// //创建订单 +// public Result createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType); //创建订单 - public Result createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType); - //创建订单 - public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodsList); + public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss, String userCouponId); //取消团员订单 public Result deleteMemberOrderById(String token, String memberOrderId); //支付订单 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java index acada86..1de501a 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CouponServiceImpl.java @@ -7,8 +7,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.CouponService; +import org.jeecg.modules.apiUtils.CommonUtils; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.teambuyCoupon.entity.TeambuyCoupon; +import org.jeecg.modules.teambuyCoupon.service.ITeambuyCouponService; import org.jeecg.modules.teambuyCouponUser.entity.TeambuyCouponUser; import org.jeecg.modules.teambuyCouponUser.service.ITeambuyCouponUserService; import org.springframework.stereotype.Service; @@ -24,6 +27,9 @@ public class CouponServiceImpl implements CouponService { //用户信息 @Resource private IHanHaiMemberService hanHaiMemberService; + //优惠券信息 + @Resource + private ITeambuyCouponService teambuyCouponService; //用户优惠券信息 @Resource private ITeambuyCouponUserService teambuyCouponUserService; @@ -33,7 +39,7 @@ public class CouponServiceImpl implements CouponService { public Result queryCouponList(String token, TeambuyCouponUser teambuyCouponUser, PageBean pageBean) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081"); + //返回信息 String massege = ""; //分页信息 @@ -55,8 +61,15 @@ public class CouponServiceImpl implements CouponService { query.eq(TeambuyCouponUser::getId, teambuyCouponUser.getId()); } if(StringUtils.isNotBlank(teambuyCouponUser.getStatus())){ - //优惠券编号 - query.eq(TeambuyCouponUser::getStatus, teambuyCouponUser.getStatus()); + if("2".equals(teambuyCouponUser.getStatus())){ + query.lt(TeambuyCouponUser::getValidDate, CommonUtils.getCurrentTime());//已失效 + }else { + //优惠券状态 + query.eq(TeambuyCouponUser::getStatus, teambuyCouponUser.getStatus()); + if("0".equals(teambuyCouponUser.getStatus())){ + query.gt(TeambuyCouponUser::getValidDate, CommonUtils.getCurrentTime());//未失效 + } + } } //优惠券所属 query.eq(TeambuyCouponUser::getUserId, hanHaiMember.getId()); @@ -72,4 +85,120 @@ public class CouponServiceImpl implements CouponService { return Result.error("优惠券列表查询失败"); } } + + //查看可领取优惠券列表 + @Override + public Result queryFetchCouponList(PageBean pageBean) { + //返回信息 + String massege = ""; + //分页信息 + Page page = null; + //查询信息 + LambdaQueryChainWrapper query = null; + //返回信息 + Page pageList = null; + + try{ + //分页 + page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + query = teambuyCouponService + .lambdaQuery(); + + //组装查询条件 + //状态为可领取 + query.eq(TeambuyCoupon::getIsFetch, "1"); + //状态为未失效 + query.gt(TeambuyCoupon::getValidDate, CommonUtils.getCurrentTime()); + //按照创建时间降序排列 + query.orderByDesc(TeambuyCoupon::getCreateTime); + + //获取优惠券信息列表 + pageList = query.page(page); + + return Result.OK("优惠券列表", pageList); + }catch (Exception e){ + e.printStackTrace(); + return Result.error("优惠券列表查询失败"); + } + } + + //领取优惠券 + @Override + public Result fetchCoupon(String token, String couponId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + try{ + //查看优惠券是否存在 + TeambuyCoupon coupon = teambuyCouponService.getById(couponId); + if(null == coupon){ + return Result.error("优惠券不存在，请检查优惠券id："+couponId); + } + + //查看用户是否领取过优惠券 + TeambuyCouponUser teambuyCouponUser = teambuyCouponUserService + .lambdaQuery() + .eq(TeambuyCouponUser::getCouponId, couponId) + .eq(TeambuyCouponUser::getUserId, hanHaiMember.getId()) + .one(); + if(null != teambuyCouponUser){ + return Result.error("已领取过优惠券，不可重复领取"); + } + + //添加用户优惠券信息 + TeambuyCouponUser couponUser = new TeambuyCouponUser(); + couponUser.setUserId(hanHaiMember.getId()); + couponUser.setCouponId(coupon.getId()); + couponUser.setDiscount(coupon.getAmount()); + couponUser.setStatus("0"); + couponUser.setValidDate(coupon.getValidDate()); + boolean result = teambuyCouponUserService.save(couponUser); + + if(result){ + return Result.error("优惠券领取成功"); + }else { + return Result.error("优惠券领取失败"); + } + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("优惠券领取失败"); + } + } + + //使用优惠券 + @Override + public Result useCoupon(String token, String userCouponId) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + try{ + //查看优惠券是否存在 + TeambuyCouponUser coupon = teambuyCouponUserService + .lambdaQuery() + .eq(TeambuyCouponUser::getId, userCouponId) + .eq(TeambuyCouponUser::getUserId, hanHaiMember.getId()) + .eq(TeambuyCouponUser::getStatus, "0")//状态为未使用 + .gt(TeambuyCouponUser::getValidDate, CommonUtils.getCurrentTime())//状态为未失效 + .one(); + if(null == coupon){ + return Result.error("优惠券不存在或已使用、已失效，请检查优惠券id："+userCouponId); + } + + //使用优惠券 + coupon.setStatus("1"); + boolean result = teambuyCouponUserService.updateById(coupon); + + if(result){ + return Result.error("优惠券使用成功"); + }else { + return Result.error("优惠券使用失败"); + } + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("优惠券使用失败"); + } + } + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LeaderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LeaderServiceImpl.java index f910988..839d3c2 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LeaderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LeaderServiceImpl.java @@ -121,8 +121,6 @@ public class LeaderServiceImpl implements LeaderService { //返回信息 String massege = ""; - - try{ //解绑团长 boolean result = teambuyTeamRelationService @@ -132,6 +130,37 @@ public class LeaderServiceImpl implements LeaderService { .set(TeambuyTeamRelation::getStatus, "0") .update(); + //判断是否新增成功 + if(result){ + return Result.OK("解绑中，请耐心等待管理员审核"); + }else { + return Result.OK("操作失败"); + } + + }catch (Exception e){ + e.printStackTrace(); + return Result.error("操作失败"); + } + } + + //取消解绑 + @Override + public Result cancelDeleteLeader(String token, TeambuyTeamRelation teamRelation) { + //权限验证 + HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); + + //返回信息 + String massege = ""; + + try{ + //取消解绑 + boolean result = teambuyTeamRelationService + .lambdaUpdate() + .eq(TeambuyTeamRelation::getMemberId, hanHaiMember.getId()) + .eq(TeambuyTeamRelation::getLeaderId, teamRelation.getLeaderId()) + .set(TeambuyTeamRelation::getStatus, "1") + .update(); + //判断是否新增成功 if(result){ return Result.OK("操作成功"); @@ -153,22 +182,33 @@ public class LeaderServiceImpl implements LeaderService { //返回信息 String massege = ""; - //查询用户是否有绑定团长，如果有，需要先解除绑定 - TeambuyTeamRelation relation = teambuyTeamRelationService.lambdaQuery() - .eq(TeambuyTeamRelation::getMemberId, hanHaiMember.getId()) - .one(); + try{ + //查询用户是否有绑定团长，如果有，需要先解除绑定 + TeambuyTeamRelation relation = teambuyTeamRelationService.lambdaQuery() + .eq(TeambuyTeamRelation::getMemberId, hanHaiMember.getId()) + .one(); -// if(null == relation){ -// return Result.error("还没有绑定团长"); -// } - if("0".equals(relation.getStatus())){ - return Result.error("原团长解绑中，解绑成功后方可更换团长"); - } - if("1".equals(relation.getStatus())){ - return Result.error("请先解除当前团长绑定"); - } + if(null == relation){ + //还没有绑定团长,先绑定团长 + TeambuyTeamRelation teambuyTeamRelation = new TeambuyTeamRelation(); + teambuyTeamRelation.setLeaderId(teamRelation.getLeaderId()); + teambuyTeamRelation.setMemberId(hanHaiMember.getId()); + boolean result = teambuyTeamRelationService.save(teambuyTeamRelation); + //判断是否更换成功 + if(result){ + return Result.OK("操作成功"); + }else { + return Result.error("操作失败"); + } + }else { + if("0".equals(relation.getStatus())){ + return Result.error("原团长解绑中，解绑成功后方可更换团长"); + } + if("1".equals(relation.getStatus())){ + return Result.error("请先解除当前团长绑定"); + } + } - try{ //更换团长 boolean result = teambuyTeamRelationService .lambdaUpdate() @@ -283,6 +323,8 @@ public class LeaderServiceImpl implements LeaderService { query = teambuyTeamLeaderService .lambdaQuery(); + //团长状态为审核通过 + query.eq(TeambuyTeamLeader::getStatus, "1"); //按照排序编号升序排列 query.orderByDesc(TeambuyTeamLeader::getCreateTime); @@ -317,6 +359,7 @@ public class LeaderServiceImpl implements LeaderService { .lambdaQuery() .eq(TeambuyTeamLeader::getId, relation.getLeaderId()) .one(); + one.setBindStatus(relation.getStatus());//绑定状态 return Result.OK("绑定团长信息详情", one); }catch (Exception e){ diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index 52cf14e..86f1416 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -14,6 +14,9 @@ import org.jeecg.modules.apiUtils.CommonUtils; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.pay.MpWxPayService; +import org.jeecg.modules.teambuyCoupon.entity.TeambuyCoupon; +import org.jeecg.modules.teambuyCouponUser.entity.TeambuyCouponUser; +import org.jeecg.modules.teambuyCouponUser.service.ITeambuyCouponUserService; import org.jeecg.modules.teambuyGoods.entity.TeambuyGoods; import org.jeecg.modules.teambuyGoods.service.ITeambuyGoodsService; import org.jeecg.modules.teambuyOrderGoods.entity.TeambuyOrderGoods; @@ -60,13 +63,16 @@ public class OrderServiceImpl implements OrderService { //商品信息信息 @Resource private ITeambuyGoodsService teambuyGoodsService; + //商品信息信息 + @Resource + private ITeambuyCouponUserService teambuyCouponUserService; /******************************************************************************************************************/ //查看团餐订单列表 @Override public Result queryLeaderOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919587097244078081"); + //返回信息 String massege = ""; //分页信息 @@ -492,89 +498,107 @@ public class OrderServiceImpl implements OrderService { } } +// //创建订单 +// @Override +// public Result createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType) { +// //权限验证 +// HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); +// +// try{ +// //订单信息 +// String payNo = IdWorker.getIdStr();//生成订单号 +// teambuyOrderMember.setId(payNo); +// teambuyOrderMember.setUserId(hanHaiMember.getId()); +// +// //订单信息编辑 +// teambuyOrderMember.setTitle("的订单");//订单名称 +// teambuyOrderMember.setUserId(hanHaiMember.getId());//订单拥有者 +// teambuyOrderMember.setOrderLeaderId("");//团餐订单编号 +// +// //查询团长信息 +// +// +// //创建团员订单 +// teambuyOrderMemberService.save(teambuyOrderMember); +// +// //订单支付 +// switch (payType){ +// //微信支付 +// case "0": +// //吊起微信支付 +// BigDecimal price = teambuyOrderMember.getPricePay();//价格 +// String productName = teambuyOrderMember.getTitle();//服务名称 +// +// String s = price.multiply(new BigDecimal(100)).toString(); +// int i1 = Double.valueOf(s).intValue(); +// Object appOrder = mpWxPayService.createOrder( +// "购买"+ productName , +// "127.0.0.1", +// teambuyOrderMember.getId(), +// i1, +// teambuyOrderMember.getId(), +// hanHaiMember.getAppletOpenid(), +// teambuyOrderMember.toString()); +// return Result.OK("支付成功",appOrder); +// +// //余额支付 +// case "1": +// //用户余额 +// BigDecimal balance = hanHaiMember.getBalance(); +// //订单实付金额 +// BigDecimal amount = teambuyOrderMember.getPricePay(); +// +// if(balance.compareTo(amount) == 1 ){ +// //等同于a>b +// balance = balance.subtract(amount); +// }else { +// return Result.error("余额不足"); +// } +// //修改用户余额 +// hanHaiMember.setBalance(balance); +// hanHaiMemberService.updateById(hanHaiMember); +// +// //修改订单信息 +// teambuyOrderMember.setStatus("1");//订单状态 +// teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 +// teambuyOrderMemberService.updateById(teambuyOrderMember); +// return Result.OK("支付成功"); +// +// } +// return Result.error("支付失败"); +// }catch (Exception e){ +// e.printStackTrace(); +// return Result.error("支付失败"); +// } +// +// } + //创建订单 @Override - public Result createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType) { + public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss, String userCouponId) { //权限验证 HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); try{ - //订单信息 - String payNo = IdWorker.getIdStr();//生成订单号 - teambuyOrderMember.setId(payNo); - teambuyOrderMember.setUserId(hanHaiMember.getId()); - - //订单信息编辑 - teambuyOrderMember.setTitle("的订单");//订单名称 - teambuyOrderMember.setUserId(hanHaiMember.getId());//订单拥有者 - teambuyOrderMember.setOrderLeaderId("");//团餐订单编号 - - //查询团长信息 - - - //创建团员订单 - teambuyOrderMemberService.save(teambuyOrderMember); - - //订单支付 - switch (payType){ - //微信支付 - case "0": - //吊起微信支付 - BigDecimal price = teambuyOrderMember.getPricePay();//价格 - String productName = teambuyOrderMember.getTitle();//服务名称 - - String s = price.multiply(new BigDecimal(100)).toString(); - int i1 = Double.valueOf(s).intValue(); - Object appOrder = mpWxPayService.createOrder( - "购买"+ productName , - "127.0.0.1", - teambuyOrderMember.getId(), - i1, - teambuyOrderMember.getId(), - hanHaiMember.getAppletOpenid(), - teambuyOrderMember.toString()); - return Result.OK("支付成功",appOrder); - - //余额支付 - case "1": - //用户余额 - BigDecimal balance = hanHaiMember.getBalance(); - //订单实付金额 - BigDecimal amount = teambuyOrderMember.getPricePay(); + if(StringUtils.isNotEmpty(userCouponId)){ + //查看优惠券是否存在 + TeambuyCouponUser coupon = teambuyCouponUserService + .lambdaQuery() + .eq(TeambuyCouponUser::getId, userCouponId) + .eq(TeambuyCouponUser::getUserId, hanHaiMember.getId()) + .eq(TeambuyCouponUser::getStatus, "0")//状态为未使用 + .gt(TeambuyCouponUser::getValidDate, CommonUtils.getCurrentTime())//状态为未失效 + .one(); + if(null == coupon){ + return Result.error("优惠券不存在或已使用、已失效，请检查优惠券id："+userCouponId); + } - if(balance.compareTo(amount) == 1 ){ - //等同于a>b - balance = balance.subtract(amount); - }else { - return Result.error("余额不足"); - } - //修改用户余额 - hanHaiMember.setBalance(balance); - hanHaiMemberService.updateById(hanHaiMember); - - //修改订单信息 - teambuyOrderMember.setStatus("1");//订单状态 - teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 - teambuyOrderMemberService.updateById(teambuyOrderMember); - return Result.OK("支付成功"); + //使用优惠券 + teambuyOrderMember.setUserCouponId(coupon.getId()); + teambuyOrderMember.setPricePreferential(coupon.getDiscount()); } - return Result.error("支付失败"); - }catch (Exception e){ - e.printStackTrace(); - return Result.error("支付失败"); - } - - } - - //创建订单 - @Override - public Result createOrder2(String token, TeambuyOrderMember teambuyOrderMember, String payType, String leaderId, String goodss) { - //权限验证 - HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); - //HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426"); - try{ //订单信息 String payNo = IdWorker.getIdStr();//生成订单号 teambuyOrderMember.setId(payNo); @@ -671,6 +695,13 @@ public class OrderServiceImpl implements OrderService { hanHaiMember.setBalance(balance); hanHaiMemberService.updateById(hanHaiMember); + //修改优惠券状态为已使用 + if(null != teambuyOrderMember.getUserCouponId()){ + TeambuyCouponUser coupon = teambuyCouponUserService.getById(teambuyOrderMember.getUserCouponId()); + coupon.setStatus("1"); + teambuyCouponUserService.updateById(coupon); + } + //修改订单信息 teambuyOrderMember.setStatus("1");//订单状态 teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 @@ -810,6 +841,13 @@ public class OrderServiceImpl implements OrderService { teambuyOrderMember.setStatus("1");//订单状态 teambuyOrderMember.setPayTime(CommonUtils.getCurrentTime());//订单支付时间 teambuyOrderMemberService.updateById(teambuyOrderMember); + + //修改优惠券状态为已使用 + if(null != teambuyOrderMember.getUserCouponId()){ + TeambuyCouponUser coupon = teambuyCouponUserService.getById(teambuyOrderMember.getUserCouponId()); + coupon.setStatus("1"); + teambuyCouponUserService.updateById(coupon); + } } }