Browse Source

1、订单模块修复

master
Aug 4 days ago
parent
commit
fef6644b82
19 changed files with 318 additions and 13 deletions
  1. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java
  2. +9
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java
  3. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java
  4. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java
  6. +12
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue
  7. +10
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue
  8. +20
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts
  9. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/controller/TeambuyLevelController.java
  10. +9
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/entity/TeambuyLevel.java
  11. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/mapper/TeambuyLevelMapper.java
  12. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/service/ITeambuyLevelService.java
  13. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/service/impl/TeambuyLevelServiceImpl.java
  14. +12
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/vue/TeambuyLevelList.vue
  15. +10
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/vue/modules/TeambuyLevelForm.vue
  16. +20
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/vue3/TeambuyLevel.data.ts
  17. +12
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java
  18. +4
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java
  19. +192
    -3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: han_hai_member
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
@Api(tags="han_hai_member")


+ 9
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: han_hai_member
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
@Data
@ -205,4 +205,12 @@ public class HanHaiMember implements Serializable {
@Dict(dictTable = "teambuy_level", dicText = "title", dicCode = "id")
@ApiModelProperty(value = "团长等级")
private java.lang.String leaderLevelId;
/**是否管理员*/
@Excel(name = "是否管理员", width = 15)
@ApiModelProperty(value = "是否管理员")
private java.lang.String isManager;
/**团长订单数量*/
@Excel(name = "团长订单数量", width = 15)
@ApiModelProperty(value = "团长订单数量")
private java.lang.Integer orderNum;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: han_hai_member
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
public interface HanHaiMemberMapper extends BaseMapper<HanHaiMember> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: han_hai_member
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
public interface IHanHaiMemberService extends IService<HanHaiMember> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: han_hai_member
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
@Service


+ 12
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue View File

@ -311,6 +311,16 @@
align:"center",
dataIndex: 'leaderLevelId_dictText'
},
{
title:'是否管理员',
align:"center",
dataIndex: 'isManager'
},
{
title:'团长订单数量',
align:"center",
dataIndex: 'orderNum'
},
{
title: '操作',
dataIndex: 'action',
@ -382,6 +392,8 @@
fieldList.push({type:'string',value:'sex',text:'性别',dictCode:''})
fieldList.push({type:'string',value:'isDai',text:'是否分销商',dictCode:''})
fieldList.push({type:'string',value:'leaderLevelId',text:'团长等级',dictCode:"teambuy_level,title,id"})
fieldList.push({type:'string',value:'isManager',text:'是否管理员',dictCode:''})
fieldList.push({type:'int',value:'orderNum',text:'团长订单数量',dictCode:''})
this.superFieldList = fieldList
}
}


+ 10
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue View File

@ -188,6 +188,16 @@
<j-dict-select-tag type="list" v-model="model.leaderLevelId" dictCode="teambuy_level,title,id" placeholder="请选择团长等级" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="是否管理员" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isManager">
<a-input v-model="model.isManager" placeholder="请输入是否管理员" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="团长订单数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNum">
<a-input-number v-model="model.orderNum" placeholder="请输入团长订单数量" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>


+ 20
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts View File

@ -193,6 +193,16 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'leaderLevelId_dictText'
},
{
title: '是否管理员',
align:"center",
dataIndex: 'isManager'
},
{
title: '团长订单数量',
align:"center",
dataIndex: 'orderNum'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@ -389,4 +399,14 @@ export const formSchema: FormSchema[] = [
dictCode:"teambuy_level,title,id"
},
},
{
label: '是否管理员',
field: 'isManager',
component: 'Input',
},
{
label: '团长订单数量',
field: 'orderNum',
component: 'InputNumber',
},
];

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/controller/TeambuyLevelController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 佣金等级表
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
@Api(tags="佣金等级表")


+ 9
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/entity/TeambuyLevel.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 佣金等级表
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
@Data
@ -55,4 +55,12 @@ public class TeambuyLevel implements Serializable {
@Excel(name = "佣金", width = 15)
@ApiModelProperty(value = "佣金")
private java.math.BigDecimal amount;
/**等级编号*/
@Excel(name = "等级编号", width = 15)
@ApiModelProperty(value = "等级编号")
private java.lang.Integer levelNo;
/**达成订单数*/
@Excel(name = "达成订单数", width = 15)
@ApiModelProperty(value = "达成订单数")
private java.lang.Integer orderNum;
}

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/mapper/TeambuyLevelMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 佣金等级表
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
public interface TeambuyLevelMapper extends BaseMapper<TeambuyLevel> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/service/ITeambuyLevelService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 佣金等级表
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
public interface ITeambuyLevelService extends IService<TeambuyLevel> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/service/impl/TeambuyLevelServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 佣金等级表
* @Author: jeecg-boot
* @Date: 2025-05-08
* @Date: 2025-06-05
* @Version: V1.0
*/
@Service


+ 12
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/vue/TeambuyLevelList.vue View File

@ -131,6 +131,16 @@
align:"center",
dataIndex: 'amount'
},
{
title:'等级编号',
align:"center",
dataIndex: 'levelNo'
},
{
title:'达成订单数',
align:"center",
dataIndex: 'orderNum'
},
{
title: '操作',
dataIndex: 'action',
@ -167,6 +177,8 @@
let fieldList=[];
fieldList.push({type:'string',value:'title',text:'等级名称',dictCode:''})
fieldList.push({type:'BigDecimal',value:'amount',text:'佣金',dictCode:''})
fieldList.push({type:'int',value:'levelNo',text:'等级编号',dictCode:''})
fieldList.push({type:'int',value:'orderNum',text:'达成订单数',dictCode:''})
this.superFieldList = fieldList
}
}


+ 10
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/vue/modules/TeambuyLevelForm.vue View File

@ -13,6 +13,16 @@
<a-input-number v-model="model.amount" placeholder="请输入佣金" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="等级编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="levelNo">
<a-input-number v-model="model.levelNo" placeholder="请输入等级编号" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="达成订单数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNum">
<a-input-number v-model="model.orderNum" placeholder="请输入达成订单数" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>


+ 20
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/teambuyLevel/vue3/TeambuyLevel.data.ts View File

@ -14,6 +14,16 @@ export const columns: BasicColumn[] = [
align:"center",
dataIndex: 'amount'
},
{
title: '等级编号',
align:"center",
dataIndex: 'levelNo'
},
{
title: '达成订单数',
align:"center",
dataIndex: 'orderNum'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
@ -30,4 +40,14 @@ export const formSchema: FormSchema[] = [
field: 'amount',
component: 'InputNumber',
},
{
label: '等级编号',
field: 'levelNo',
component: 'InputNumber',
},
{
label: '达成订单数',
field: 'orderNum',
component: 'InputNumber',
},
];

+ 12
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/teambuyController/OrderController.java View File

@ -24,6 +24,18 @@ public class OrderController {
@Resource
private OrderService orderService;
/******************************************************************************************************************/
//查看管理员订单列表
@ApiOperation(value="订单-查看管理员订单列表", notes="status:0-待出餐 1-已出餐 2-待取餐 3-已完成")
@RequestMapping(value = "/managerOrderList", method = {RequestMethod.GET})
public Result<?> managerOrderList(@RequestHeader("X-Access-Token") String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean){
return orderService.managerOrderList(token, teambuyOrderLeader, pageBean);
}
//批量修改团长订单状态
@ApiOperation(value="订单-管理员批量修改团长订单状态", notes="订单-管理员批量修改团长订单状态")
@RequestMapping(value = "/updateOrders", method = {RequestMethod.POST})
public Result<?> updateOrders(@RequestHeader("X-Access-Token") String token, String orderIds){
return orderService.updateOrders(token, orderIds);
}
//查看团餐订单列表
@ApiOperation(value="订单-查询团餐订单列表/详情", notes="status:0-待出餐 1-已出餐 2-待取餐 3-已完成")


+ 4
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderService.java View File

@ -13,6 +13,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
import java.util.List;
public interface OrderService {
//查看管理员订单列表
public Result<?> managerOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean);
//批量修改团长订单状态
public Result<?> updateOrders(String token, String orderIds);
//查看团餐订单列表
public Result<?> queryLeaderOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean);
//根据团餐id查询团团员订单列表


+ 192
- 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java View File

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.config.shiro.ShiroRealm;
@ -39,6 +40,7 @@ import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
@ -81,6 +83,128 @@ public class OrderServiceImpl implements OrderService {
@Resource
private ITeambuyBalanceLogService teambuyBalanceLogService;
/******************************************************************************************************************/
//查看管理员订单列表
@Override
public Result<?> managerOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
//返回信息
String massege = "";
//分页信息
Page<TeambuyOrderLeader> page = null;
//查询信息
LambdaQueryChainWrapper<TeambuyOrderLeader> query = null;
//返回信息
Page<TeambuyOrderLeader> pageList = null;
try{
//判断用户是否是管理员
if(!"1".equals(hanHaiMember.getIsManager())){
return Result.OK("您还不是管理员,请申请成为管理员");
}
//分页
page = new Page<TeambuyOrderLeader>(pageBean.getPageNo(), pageBean.getPageSize());
query = teambuyOrderLeaderService
.lambdaQuery();
//组装查询条件
if(StringUtils.isNotBlank(teambuyOrderLeader.getTitle())){
//订单标题
query.like(TeambuyOrderLeader::getId, teambuyOrderLeader.getTitle());
}
if(StringUtils.isNotBlank(teambuyOrderLeader.getId())){
//订单编号
query.eq(TeambuyOrderLeader::getId, teambuyOrderLeader.getId());
}
if(StringUtils.isNotBlank(teambuyOrderLeader.getStatus())){
//订单状态
query.eq(TeambuyOrderLeader::getStatus, teambuyOrderLeader.getStatus());
}
// //团餐订单所属
// TeambuyTeamLeader leader = teambuyTeamLeaderService
// .lambdaQuery()
// .eq(TeambuyTeamLeader::getUserId, hanHaiMember.getId())
// .one();
// //团长id
// query.eq(TeambuyOrderLeader::getUserId, leader.getId());
//按照创建时间降序排列
query.orderByDesc(TeambuyOrderLeader::getCreateTime);
//获取团餐内团员订单信息
pageList = query.page(page);
// if(null == pageList){
// return Result.OK("团餐订单列表为空", pageList);
// }
// for (TeambuyOrderLeader record : pageList.getRecords()) {
// List<TeambuyOrderMember> orderMemberList = getOrderMemberList(record.getId());
// record.setOrderMemberList(orderMemberList);
// }
return Result.OK("订单列表", pageList);
}catch (Exception e){
e.printStackTrace();
return Result.error("订单列表查询失败");
}
}
//管理员批量修改团长订单
@Override
public Result<?> updateOrders(String token, String orderIds) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
//返回信息
String massege = "";
try{
//判断是否为管理员
if(!"1".equals(hanHaiMember.getIsManager())){
return Result.error("操作失败,您还不是管理员,请申请成为管理员");
}
String[] orderIdList = orderIds.split(";");
List<TeambuyOrderLeader> leaderList = new ArrayList<>();
for (String orderId : orderIdList) {
TeambuyOrderLeader orderLeader = teambuyOrderLeaderService.getById(orderId);
int status = Integer.parseInt(orderLeader.getStatus());
if(status < 3){
status = status + 1;
}else {
status = 3;
//批量完成团长订单时将团餐订单下的团员订单状态也改为已完成
boolean result = teambuyOrderMemberService
.lambdaUpdate()
.eq(TeambuyOrderMember::getOrderLeaderId, orderId)
.set(TeambuyOrderMember::getStatus, "4")
.update();
}
orderLeader.setStatus(""+status);
leaderList.add(orderLeader);
}
//执行新增操作(不传id进行新增传了id则进行修改)
boolean result = teambuyOrderLeaderService.updateBatchById(leaderList);
for (String orderId : orderIdList) {
//判断关联的团长订单下的团员订单是否均已完成如果均已完成则将团长订单修改成已完成
finishLeaderOrder(orderId);
}
//判断是否新增成功
if(result){
return Result.OK("操作成功");
}else {
return Result.OK("操作失败");
}
}catch (Exception e){
e.printStackTrace();
return Result.error("操作失败");
}
}
//查看团餐订单列表
@Override
public Result<?> queryLeaderOrderList(String token, TeambuyOrderLeader teambuyOrderLeader, PageBean pageBean) {
@ -103,6 +227,10 @@ public class OrderServiceImpl implements OrderService {
.lambdaQuery();
//组装查询条件
if(StringUtils.isNotBlank(teambuyOrderLeader.getTitle())){
//订单标题
query.like(TeambuyOrderLeader::getId, teambuyOrderLeader.getTitle());
}
if(StringUtils.isNotBlank(teambuyOrderLeader.getId())){
//订单编号
query.eq(TeambuyOrderLeader::getId, teambuyOrderLeader.getId());
@ -342,13 +470,16 @@ public class OrderServiceImpl implements OrderService {
if(null == orderLeader){
return Result.error("该订单不属于该团长,请核对订单编号:"+leaderOrderId);
}
//将团餐订单下的团员订单状态改为待取餐
//将团餐订单下的团员订单状态改为已完成
boolean result = teambuyOrderMemberService
.lambdaUpdate()
.eq(TeambuyOrderMember::getOrderLeaderId, leaderOrderId)
.set(TeambuyOrderMember::getStatus, "4")
.update();
//判断关联的团长订单下的团员订单是否均已完成如果均已完成则将团长订单修改成已完成
finishLeaderOrder(orderLeader.getId());
//判断是否新增成功
if(result){
return Result.OK("操作成功");
@ -362,7 +493,7 @@ public class OrderServiceImpl implements OrderService {
}
}
//团长通知全体团员取餐
//团长通知单个团员取餐
@Override
public Result<?> informOrderOne(String token, String memberOrderId) {
//权限验证
@ -410,6 +541,10 @@ public class OrderServiceImpl implements OrderService {
.set(TeambuyOrderMember::getStatus, "4")
.update();
//判断关联的团长订单下的团员订单是否均已完成如果均已完成则将团长订单修改成已完成
TeambuyOrderMember orderMember = teambuyOrderMemberService.getById(memberOrderId);
finishLeaderOrder(orderMember.getOrderLeaderId());
//判断是否新增成功
if(result){
return Result.OK("操作成功");
@ -482,7 +617,7 @@ public class OrderServiceImpl implements OrderService {
public Result<?> finishMemberOrderById(String token, String memberOrderId) {
//权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//HanHaiMember hanHaiMember = hanHaiMemberService.getById("1898983659468853250");
//HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919589727643111426");
//返回信息
String massege = "";
@ -500,6 +635,9 @@ public class OrderServiceImpl implements OrderService {
teambuyOrderMember.setStatus("4");
boolean result = teambuyOrderMemberService.updateById(teambuyOrderMember);
//判断关联的团长订单下的团员订单是否均已完成如果均已完成则将团长订单修改成已完成
finishLeaderOrder(teambuyOrderMember.getOrderLeaderId());
//判断是否新增成功
if(result){
return Result.OK("操作成功");
@ -513,6 +651,57 @@ public class OrderServiceImpl implements OrderService {
}
}
public void finishLeaderOrder(String leaderOrderId){
//判断关联的团长订单下的团员订单是否均已完成如果均已完成则将团长订单修改成已完成
List<TeambuyOrderMember> memberList = teambuyOrderMemberService
.lambdaQuery()
.eq(TeambuyOrderMember::getOrderLeaderId, leaderOrderId)
.list();
boolean finishFlag = true;
for (TeambuyOrderMember member : memberList) {
if(!"4".equals(member.getStatus())){
finishFlag = false;
break;
}
}
//团长订单下的团员订单均已完成
if(finishFlag){
//将团长订单改成已完成状态
TeambuyOrderLeader orderLeader = teambuyOrderLeaderService.getById(leaderOrderId);
orderLeader.setStatus("3");
teambuyOrderLeaderService.updateById(orderLeader);
//增加团长佣金订单数量
TeambuyTeamLeader leader = teambuyTeamLeaderService.getById(orderLeader.getUserId());//获取团长当前信息
HanHaiMember member = hanHaiMemberService.getById(leader.getUserId());//获取团长用户信息
TeambuyLevel teambuyLevel = teambuyLevelService.getById(member.getLeaderLevelId());//获取团长当前佣金等级金额
BigDecimal balance = member.getBalance().add(teambuyLevel.getAmount());//增加佣金
int orderNum = member.getOrderNum() + 1;
member.setBalance(balance);//增加佣金
member.setOrderNum(orderNum);//增加订单数量
//判断团长等级是否进入下一级
List<TeambuyLevel> levelList = teambuyLevelService
.lambdaQuery()
.orderByAsc(TeambuyLevel::getLevelNo)
.list();
int level = 0;
Map<Integer, String > map = new HashedMap();
for (TeambuyLevel teambuyLevel1 : levelList) {
map.put(teambuyLevel1.getLevelNo(), teambuyLevel1.getId());
if(teambuyLevel1.getOrderNum() < member.getOrderNum()){
level = teambuyLevel1.getLevelNo();
}
}
if(teambuyLevel.getLevelNo() < level){
member.setLeaderLevelId(map.get(level));
}
hanHaiMemberService.updateById(member);
}
}
// //创建订单
// @Override
// public Result<?> createOrder(String token, TeambuyOrderMember teambuyOrderMember, String payType) {


Loading…
Cancel
Save