diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/controller/TeambuyOrderLeaderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/controller/TeambuyOrderLeaderController.java index 4a5268d..c21867b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/controller/TeambuyOrderLeaderController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/controller/TeambuyOrderLeaderController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 团长团餐订单表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-26 * @Version: V1.0 */ @Api(tags="团长团餐订单表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/entity/TeambuyOrderLeader.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/entity/TeambuyOrderLeader.java index 70b5b94..10cc46d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/entity/TeambuyOrderLeader.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/entity/TeambuyOrderLeader.java @@ -24,7 +24,7 @@ import lombok.experimental.Accessors; /** * @Description: 团长团餐订单表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-26 * @Version: V1.0 */ @Data @@ -61,13 +61,20 @@ public class TeambuyOrderLeader implements Serializable { @ApiModelProperty(value = "团餐订单状态") private java.lang.String status; /**关联团长id*/ - @Excel(name = "关联团长id", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") - @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Excel(name = "关联团长id", width = 15, dictTable = "teambuy_team_leader", dicText = "name", dicCode = "id") + @Dict(dictTable = "teambuy_team_leader", dicText = "name", dicCode = "id") @ApiModelProperty(value = "关联团长id") private java.lang.String userId; + /**订单佣金*/ + @Excel(name = "订单佣金", width = 15) + @ApiModelProperty(value = "订单佣金") + private java.math.BigDecimal commission; //团餐下的订单列表信息 @TableField(exist = false) List orderMemberList; + //团餐下的订单列表总数 + @TableField(exist = false) + int total; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/mapper/TeambuyOrderLeaderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/mapper/TeambuyOrderLeaderMapper.java index 3404188..fd28263 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/mapper/TeambuyOrderLeaderMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/mapper/TeambuyOrderLeaderMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 团长团餐订单表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-26 * @Version: V1.0 */ public interface TeambuyOrderLeaderMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/ITeambuyOrderLeaderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/ITeambuyOrderLeaderService.java index ed14c03..2ba9a15 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/ITeambuyOrderLeaderService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/ITeambuyOrderLeaderService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 团长团餐订单表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-26 * @Version: V1.0 */ public interface ITeambuyOrderLeaderService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/impl/TeambuyOrderLeaderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/impl/TeambuyOrderLeaderServiceImpl.java index f24681b..8f07a2d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/impl/TeambuyOrderLeaderServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/service/impl/TeambuyOrderLeaderServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 团长团餐订单表 * @Author: jeecg-boot - * @Date: 2025-04-24 + * @Date: 2025-05-26 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/TeambuyOrderLeaderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/TeambuyOrderLeaderList.vue index 65f1c66..439bfc5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/TeambuyOrderLeaderList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/TeambuyOrderLeaderList.vue @@ -137,6 +137,11 @@ align:"center", dataIndex: 'userId_dictText' }, + { + title:'订单佣金', + align:"center", + dataIndex: 'commission' + }, { title: '操作', dataIndex: 'action', @@ -173,7 +178,8 @@ let fieldList=[]; fieldList.push({type:'string',value:'title',text:'团餐订单名称',dictCode:''}) fieldList.push({type:'string',value:'status',text:'团餐订单状态',dictCode:'teambuy_status_teamorder'}) - fieldList.push({type:'string',value:'userId',text:'关联团长id',dictCode:"han_hai_member,nick_name,id"}) + fieldList.push({type:'string',value:'userId',text:'关联团长id',dictCode:"teambuy_team_leader,name,id"}) + fieldList.push({type:'BigDecimal',value:'commission',text:'订单佣金',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/modules/TeambuyOrderLeaderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/modules/TeambuyOrderLeaderForm.vue index 69ba9db..a41513d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/modules/TeambuyOrderLeaderForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue/modules/TeambuyOrderLeaderForm.vue @@ -15,7 +15,12 @@ - + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue3/TeambuyOrderLeader.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue3/TeambuyOrderLeader.data.ts index df96277..6680b97 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue3/TeambuyOrderLeader.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyOrderLeader/vue3/TeambuyOrderLeader.data.ts @@ -19,6 +19,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId_dictText' }, + { + title: '订单佣金', + align:"center", + dataIndex: 'commission' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -43,7 +48,12 @@ export const formSchema: FormSchema[] = [ field: 'userId', component: 'JDictSelectTag', componentProps:{ - dictCode:"han_hai_member,nick_name,id" + dictCode:"teambuy_team_leader,name,id" }, }, + { + label: '订单佣金', + field: 'commission', + component: 'InputNumber', + }, ]; 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 839d3c2..f64e622 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 @@ -244,6 +244,15 @@ public class LeaderServiceImpl implements LeaderService { .eq(TeambuyTeamLeader::getUserId, hanHaiMember.getId()) .one(); + //修改团长等级 + if("1".equals(one.getStatus())){ + hanHaiMember.setLeaderLevelId("1920313132579389441"); + hanHaiMemberService.updateById(hanHaiMember); + }else { + hanHaiMember.setLeaderLevelId("0"); + hanHaiMemberService.updateById(hanHaiMember); + } + return Result.OK("团长信息详情", one); }catch (Exception e){ e.printStackTrace(); 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 3cddd7a..2dbe70f 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 @@ -21,6 +21,8 @@ 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.teambuyLevel.entity.TeambuyLevel; +import org.jeecg.modules.teambuyLevel.service.ITeambuyLevelService; import org.jeecg.modules.teambuyOrderGoods.entity.TeambuyOrderGoods; import org.jeecg.modules.teambuyOrderGoods.service.ITeambuyOrderGoodsService; import org.jeecg.modules.teambuyOrderLeader.entity.TeambuyOrderLeader; @@ -54,6 +56,9 @@ public class OrderServiceImpl implements OrderService { //用户信息 @Resource private IHanHaiMemberService hanHaiMemberService; + //佣金等级 + @Resource + private ITeambuyLevelService teambuyLevelService; //团长信息 @Resource private ITeambuyTeamLeaderService teambuyTeamLeaderService; @@ -145,6 +150,7 @@ public class OrderServiceImpl implements OrderService { TeambuyOrderLeader order = teambuyOrderLeaderService.getById(teambuyOrderId); List orderMemberList = getOrderMemberList(order.getId()); order.setOrderMemberList(orderMemberList); + order.setTotal(orderMemberList.size()); return Result.OK("订单列表", order); }catch (Exception e){ @@ -632,9 +638,15 @@ public class OrderServiceImpl implements OrderService { .eq(TeambuyOrderLeader::getStatus, 0) .one(); if(null == orderLeader){ + //团长信息 + HanHaiMember leader = hanHaiMemberService.getById(teamLeader.getUserId()); + //团长佣金 + TeambuyLevel level = teambuyLevelService.getById(leader.getLeaderLevelId()); + TeambuyOrderLeader orderLeader1 = new TeambuyOrderLeader(); orderLeader1.setTitle("团长订单"+CommonUtils.getCurrentTimeFormat()); orderLeader1.setUserId(teamLeader.getId()); + orderLeader1.setCommission(level.getAmount()); teambuyOrderLeaderService.save(orderLeader1); //延迟2s