Merge branch 'dev' into pre

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/ShoppingCartVo.java

@@ -72,4 +72,6 @@ public class ShoppingCartVo {
 	private List<ClassGradeVo> gradeList;
 	@ApiModelProperty("七大员继教可选年份")
 	private String sevenYear;
+	@ApiModelProperty("寄件标签：1是 0否")
+	private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -219,4 +219,6 @@ public class GoodsAddBo {
     private String questionRelIds;
     @ApiModelProperty("视频标签：1保利威 2腾讯")
     private Integer viewSign;
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -253,4 +253,6 @@ public class GoodsEditBo {
     private String questionRelIds;
     @ApiModelProperty("视频标签：1保利威 2腾讯")
     private Integer viewSign;
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -186,5 +186,6 @@ private static final long serialVersionUID=1L;
     /** 视频标签：1保利威 2腾讯 */
     private Integer viewSign;
     /** 寄件标签：1是 0否 */
+    @TableField(updateStrategy=FieldStrategy.IGNORED)
     private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -404,4 +404,6 @@ public class GoodsVo {
 	/** 视频标签：1保利威 2腾讯 */
 	@ApiModelProperty("视频标签：1保利威 2腾讯")
 	private Integer viewSign;
+	@ApiModelProperty("寄件标签：1是 0否")
+	private Integer mailSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/SpecAttrPriceVo.java

@@ -149,6 +149,7 @@ public class SpecAttrPriceVo implements Serializable {
     private Boolean jjShiGongYuan;
     @ApiModelProperty("是否是二建二造")
     private Boolean erJianErZao;
-
+    @ApiModelProperty("寄件标签：1是 0否")
+    private Integer mailSign;
 
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.order.bo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,8 +11,8 @@ import java.io.Serializable;
  */
 @Data
 public class MailOrderBo implements Serializable {
-
+    @ApiModelProperty("订单号")
     private String orderSn;
-
+    @ApiModelProperty("寄件状态：1已处理 0待处理")
     private Integer mailStatus;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.order.bo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,10 +12,10 @@ import java.util.List;
  */
 @Data
 public class MailOrderHandleBo implements Serializable {
-
+    @ApiModelProperty("订单号集合")
     private List<String> orderSnList;
-
+    @ApiModelProperty("寄件状态：1已处理 0待处理")
     private Integer mailStatus;
-
+    @ApiModelProperty("寄件备注")
     private String mailRemark;
 }

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/OrderGoodsServiceImpl.java

@@ -924,7 +924,7 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                         Major major = iMajorService.getById(goods.getMajorId());
                         format = format +"/"+ major.getCategoryName();
                     }
-                    format = format + String.format("%s套教材",size);
+                    format = format + String.format("(%s套教材)",size);
                     mailTail.add(format);
                 }
                 item.setMailDetail(mailTail);

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/base/ShoppingCartMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="distributionCode" column="distribution_code"/>
         <result property="choiceStatus" column="choice_status"/>
         <result property="sevenYear" column="seven_year"/>
+        <result property="mailSign" column="mail_sign"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.base.bo.ShoppingCartQueryBo"  resultMap="ShoppingCartVoResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             g.project_id,
             g.class_hours,
             g.seven_year,
+            g.mail_sign,
             ot.type AS template_type,
             cet.education_name,
             cpt.project_name,

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -106,6 +106,7 @@
         <result property="externalLink" column="external_link"/>
         <result property="externalLinkStatus" column="external_link_status"/>
         <result property="sevenYear" column="seven_year"/>
+        <result property="mailSign" column="mail_sign"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>

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
@@ -957,8 +959,9 @@
                 AND order_sn = #{orderSn}
             </if>
             <if test="mailStatus != null">
-                AND mail_status = #{mail_status}
+                AND mail_status = #{mailStatus}
             </if>
+          order by create_time DESC
     </select>
 
 </mapper>