submit:分销订单处理

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -91,6 +91,8 @@ private static final long serialVersionUID=1L;
     private String inputOrderSn;
     /** 支付状态 0未收费，1部分付款  2完全付款 3免费 */
     private Integer payStatus;
+    /** 商户ID*/
+    private Long tenantId;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderShareGoodsVo.java

@@ -19,6 +19,15 @@ public class OrderShareGoodsVo {
     @ApiModelProperty("教育ID")
     private Long educationId;
 
+    @ApiModelProperty("业务层次ID")
+    private String businessName;
+
+    @ApiModelProperty("项目ID")
+    private String projectName;
+
+    @ApiModelProperty("教育ID")
+    private String educationName;
+
     @ApiModelProperty("商品ID")
     private Long goodsId;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderShareToOldVo.java

@@ -37,4 +37,7 @@ public class OrderShareToOldVo {
 
     @ApiModelProperty("订单取消价格")
     private BigDecimal canceamount;
+
+    @ApiModelProperty("企业ID")
+    private String tenantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,6 +29,12 @@ import com.zhongzheng.common.utils.polyv.PolyvUtils;
 import com.zhongzheng.common.utils.wxpay.*;
 import com.zhongzheng.modules.base.service.IShoppingCartService;
 import com.zhongzheng.modules.course.domain.Course;
+import com.zhongzheng.modules.course.domain.CourseBusiness;
+import com.zhongzheng.modules.course.domain.CourseEducationType;
+import com.zhongzheng.modules.course.domain.CourseProjectType;
+import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import com.zhongzheng.modules.course.service.ICourseEducationTypeService;
+import com.zhongzheng.modules.course.service.ICourseProjectTypeService;
 import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.exam.domain.ExamNumber;
 import com.zhongzheng.modules.exam.service.IExamNoteService;
@@ -177,6 +184,15 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private IOrderShareMoneyService iOrderShareMoneyService;
 
+    @Autowired
+    private ICourseEducationTypeService iCourseEducationTypeService;
+
+    @Autowired
+    private ICourseProjectTypeService iCourseProjectTypeService;
+
+    @Autowired
+    private ICourseBusinessService iCourseBusinessService;
+
     @Autowired
     private ISysConfigService configService;
 
@@ -511,11 +527,24 @@ public class WxPayServiceImpl implements IWxPayService {
                 vo.setRealname(user.getRealname());
                 vo.setTelphone(user.getTelphone());
                 vo.setIdCard(user.getIdCard());
+                vo.setTenantId(order.getTenantId().toString());
                 List<OrderShareGoodsVo> shareGoodsVoList = new ArrayList<>();
                 for(OrderGoods goods : goodsList){
                     GoodsVo goodsVo = iGoodsService.queryById(goods.getGoodsId());
                     OrderShareGoodsVo shareGoodsVo = BeanUtil.toBean(goodsVo, OrderShareGoodsVo.class);
                     shareGoodsVo.setEducationId(goodsVo.getEducationTypeId());
+                    CourseEducationType type = iCourseEducationTypeService.getById(goodsVo.getEducationTypeId());
+                    if (ObjectUtils.isNotNull(type)){
+                        shareGoodsVo.setEducationName(type.getEducationName());
+                    }
+                    CourseProjectType projectType = iCourseProjectTypeService.getById(goodsVo.getProjectId());
+                    if (ObjectUtils.isNotNull(projectType)){
+                        shareGoodsVo.setProjectName(projectType.getProjectName());
+                    }
+                    CourseBusiness business = iCourseBusinessService.getById(goodsVo.getBusinessId());
+                    if (ObjectUtils.isNotNull(business)){
+                        shareGoodsVo.setBusinessName(business.getBusinessName());
+                    }
                     shareGoodsVoList.add(shareGoodsVo);
                 }
                 vo.setGoodsList(shareGoodsVoList);