submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -103,4 +103,12 @@ public class OrderGoodsAddBo {
     private Long relevanceId;
     @ApiModelProperty("预约订单商品ID")
     private Long subOrderGoodsId;
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
+    @ApiModelProperty("收件人")
+    private String consignee;
+    @ApiModelProperty("手机号码")
+    private String consigneePhone;
+    @ApiModelProperty("手机地址")
+    private String consigneeSite;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1310,11 +1310,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        if (ObjectUtils.isNotNull(add.getOrderType())){
-            add.setOrderType(add.getOrderType());
-        }else {
-            add.setOrderType(Order.CONSUME_ORDER);
-        }
+        add.setOrderType(Order.CONSUME_ORDER);
         //订单运营类型
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
@@ -1342,6 +1338,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     throw new CustomException(goods.getGoodsName() + "，请勿重复购买相同年份的商品");
                 }
             }
+            if (ObjectUtils.isNotNull(g.getMailSign()) && g.getMailSign() == 1){
+                //寄件商品
+                add.setOrderType(5);
+                add.setConsignee(g.getConsignee());
+                add.setConsigneePhone(g.getConsigneePhone());
+                add.setConsigneeSite(g.getConsigneeSite());
+            }
             body = "中正云-" + goods.getGoodsName();
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
@@ -1762,6 +1765,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     throw new CustomException(goods.getGoodsName() + "，请勿重复购买相同年份的商品");
                 }
             }
+            if (ObjectUtils.isNotNull(g.getMailSign()) && g.getMailSign() == 1){
+                //寄件商品
+                add.setOrderType(5);
+                add.setConsignee(g.getConsignee());
+                add.setConsigneePhone(g.getConsigneePhone());
+                add.setConsigneeSite(g.getConsigneeSite());
+            }
             body = "中正云-" + goods.getGoodsName();
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
@@ -1941,11 +1951,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        if (ObjectUtils.isNotNull(add.getOrderType())){
-            add.setOrderType(add.getOrderType());
-        }else {
-            add.setOrderType(Order.CONSUME_ORDER);
-        }
+        add.setOrderType(Order.CONSUME_ORDER);
         //订单运营类型
         String tenantId = ServletUtils.getRequest().getHeader("TenantId");
         SysOldOrg oldOrg = iSysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getTenantId, Long.valueOf(tenantId)).last("limit 1"));
@@ -1973,6 +1979,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     throw new CustomException(goods.getGoodsName() + "，请勿重复购买相同年份的商品");
                 }
             }
+            if (ObjectUtils.isNotNull(g.getMailSign()) && g.getMailSign() == 1){
+                //寄件商品
+                add.setOrderType(5);
+                add.setConsignee(g.getConsignee());
+                add.setConsigneePhone(g.getConsigneePhone());
+                add.setConsigneeSite(g.getConsigneeSite());
+            }
             body = "中正云-" + goods.getGoodsName();
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);

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

@@ -372,4 +372,7 @@ public class OrderGoodsVo {
 	@Excel(name = "复制状态 1自学 2复制")
 	@ApiModelProperty("复制状态 1自学 2复制")
 	private Integer sevenClassCopy;
+
+	@ApiModelProperty("寄件标签：1是 0否")
+	private Integer mailSign;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -119,6 +119,7 @@
         <result property="orderYear" column="order_year"/>
         <result property="sevenClassCopy" column="seven_class_copy"/>
         <result property="studyStatus" column="study_status"/>
+        <result property="mailSign" column="mail_sign"/>
     </resultMap>
 
     <select id="selectListBybo" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo"
@@ -129,6 +130,7 @@
         g.goods_name,
         g.goods_type,
         g.cover_url,
+        g.mail_sign,
         cet.education_name,
         cpt.project_name,
         cb.business_name