yangdamao 1 年之前
父节点
当前提交
d85e364e44

+ 2 - 0
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;
 }

+ 2 - 1
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;
 
 }

+ 3 - 2
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;
 }

+ 4 - 3
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;
 }

+ 2 - 0
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,