变更

hai-order/src/main/java/com/web/controller/business/OrderMobileRechargeController.java

@@ -313,6 +313,7 @@ public class OrderMobileRechargeController {
 
             HighOrder order  = highOrderService.getOrderByOrderNo(orderNo);
             order.setExceptionStatus(false);
+            order.setOrderStatus(4);
             highOrderService.updateOrder(order);
 
             return ResponseMsgUtil.success("操作成功");

hai-service/src/main/java/com/hai/order/model/CreateOrderModel.java

@@ -74,6 +74,23 @@ public class CreateOrderModel {
      */
     private Long deliveryAddressId;
 
+    /**
+     * 产品类型
+     1：星巴克
+     2：肯德基
+     3：会员充值
+     4：积分充值
+     5：购买卡券
+     6：加油服务
+     7：优惠券包
+     8：汇联通充值
+     9：话费充值
+     10:电影票
+     11:贵州中石化
+     12:实物商品
+     */
+    private Integer productType;
+
     /**
      * 子订单参数模型
      */

hai-service/src/main/java/com/hai/order/model/combine/CreateCombine.java

@@ -51,22 +51,7 @@ public class CreateCombine {
      */
     private String memPhone;
 
-    /**
-     * 产品类型
-     1：星巴克
-     2：肯德基
-     3：会员充值
-     4：积分充值
-     5：购买卡券
-     6：加油服务
-     7：优惠券包
-     8：汇联通充值
-     9：话费充值
-     10:电影票
-     11:贵州中石化
-     12:实物商品
-     */
-    private Integer productType;
+
 
     /**
      * @Author Sum1Dream

hai-service/src/main/java/com/hai/order/service/impl/OrderServiceImpl.java

@@ -168,7 +168,6 @@ public class OrderServiceImpl implements OrderService {
             order.setPromoteCode(popularizeUser.getAgentId().toString());
         }
 
-        order.setCombineOrderNo(createOrderModel.getCombineOrderNo());
         order.setOrderNo(createOrderModel.getOrderNo());
         order.setMemId(createOrderModel.getMemId());
         order.setMemName(createOrderModel.getMemName());
@@ -873,7 +872,7 @@ public class OrderServiceImpl implements OrderService {
 
         if (MapUtils.getLong(param, "refundTimeS") != null) {
             criteria.andRefundTimeGreaterThanOrEqualTo(new Date(MapUtils.getLong(param, "refundTimeS")));
-        }
+        } 
         if (MapUtils.getLong(param, "refundTimeE") != null) {
             criteria.andRefundTimeLessThan(new Date(MapUtils.getLong(param, "refundTimeE")));
         }
@@ -939,6 +938,66 @@ public class OrderServiceImpl implements OrderService {
 
         List<CreateOrderModel> createOrderModels = createCombine.getCreateOrderModel();
 
+        // 查询推广员信息
+        Map<String, Object> mapUser = new HashMap<>();
+        mapUser.put("userId" , createCombine.getMemId());
+        BsDistributionUserRel popularizeUser = bsDistributionUserRelService.findDistributionUserRel(mapUser);
+
+        HighOrder order = new HighOrder();
+        if (popularizeUser != null) {
+            order.setPromoteCode(popularizeUser.getAgentId().toString());
+        }
+
+        for (CreateOrderModel createOrderModel : createOrderModels) {
+            order.setCombineOrderNo(createCombine.getCombineOrderNo());
+            order.setOrderNo(createOrderModel.getOrderNo());
+            order.setMemId(createOrderModel.getMemId());
+            order.setMemName(createOrderModel.getMemName());
+            order.setMemPhone(createOrderModel.getMemPhone());
+            order.setRemarks(createOrderModel.getRemarks());
+            order.setOrderStatus(OrderStatus.STATUS1.getNumber());
+            order.setWhetherCheck(false);
+            order.setWhetherRebate(false);
+            order.setProfitSharingStatus(false);
+            order.setExceptionStatus(false);
+            order.setCreateTime(new Date());
+            order.setDeductionCouponPrice(new BigDecimal("0"));
+            order.setDeductionProductPrice(new BigDecimal("0"));
+            order.setCompanyId(createOrderModel.getCompanyId());
+
+            if (createOrderModel.getProductType() == 12) {}
+
+            /*********** 组装处理子订单 商品业务************/
+            List<HighChildOrder> childOrderList = new ArrayList<>();
+            for (CreateOrderChildModel child : createOrderModel.getChildOrderList()) {
+                child.setMemId(order.getMemId());
+                child.setMemName(order.getMemName());
+                child.setMemPhone(order.getMemPhone());
+                child.setOrderNo(order.getOrderNo());
+
+                if (child.getGoodsType().equals(OrderChildGoodsType.TYPE11.getNumber())) {
+
+                    HighChildOrder childOrder = orderCreateHandleService.goods(order , child);
+                    childOrderList.add(childOrder);
+                    order.setProductType(OrderProductType.PRODUCT_TYPE12.getNumber());
+                    order.setSecUserId(childOrder.getId());
+
+                    if (StringUtils.isBlank(order.getTitle())) {
+                        order.setTitle(childOrder.getGoodsName());
+                        order.setExt6(childOrder.getGoodsImg());
+                    } else {
+                        order.setTitle(order.getTitle() + "+" +childOrder.getGoodsName());
+                        order.setExt6(order.getExt6() + "," +childOrder.getGoodsImg());
+                    }
+
+
+
+
+                }
+
+            }
+        }
+
         return null;
     }
 }