定制牙刷

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/customized/CustomizedTooth.java

@@ -29,6 +29,8 @@ public class CustomizedTooth  implements  Serializable{
     private String toothAvatarImg;
     //生成的牙刷图片
     private String toothImg;
+    //牙刷二维码图片
+    private String toothCodeImg;
     //类型 1微信 2天猫
     private Integer toothType;
     //状态：1：正常 2:作废
@@ -139,4 +141,12 @@ public class CustomizedTooth  implements  Serializable{
     public void setToothCreateTime(Date  toothCreateTime){
         this.toothCreateTime=toothCreateTime;
     }
+
+    public String getToothCodeImg() {
+        return toothCodeImg;
+    }
+
+    public void setToothCodeImg(String toothCodeImg) {
+        this.toothCodeImg = toothCodeImg;
+    }
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/customized/OrderCustomized.java

@@ -51,6 +51,10 @@ public class OrderCustomized  implements  Serializable{
     private String customizedAvatarImg;
     //生成的牙刷图片
     private String customizedImg;
+
+    //牙刷二维码图片
+    private String customizedCodeImg;
+
     //类型：1微信 2天猫
     private Integer customizedType;
     //状态 1:正常 2:外部订单未上传
@@ -282,4 +286,14 @@ public class OrderCustomized  implements  Serializable{
     public void setSalesStatus(Integer salesStatus) {
         this.salesStatus = salesStatus;
     }
+
+    public String getCustomizedCodeImg() {
+        return customizedCodeImg;
+    }
+
+    public void setCustomizedCodeImg(String customizedCodeImg) {
+        this.customizedCodeImg = customizedCodeImg;
+    }
+
+
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -764,6 +764,7 @@
 			O.SALES_ORDER_TYPE = 1
 		AND O.SALES_STATUS !=  1
 		AND O.SALES_STATUS !=  0
+		AND O.sales_is_customized = 1
 		<if test="salesStatus != null and salesStatus != -1">
 			AND O.SALES_STATUS = #{salesStatus}
 		</if>
@@ -806,6 +807,7 @@
 		O.SALES_ORDER_TYPE = 1
 		AND O.SALES_STATUS !=  1
 		AND O.SALES_STATUS !=  0
+		AND O.sales_is_customized = 1
 		<if test="salesStatus != null and salesStatus != -1">
 			AND O.SALES_STATUS = #{salesStatus}
 		</if>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/customizedToothMapper.xml

@@ -12,6 +12,7 @@
         <result    column="tooth_text"    property="toothText" />
         <result    column="tooth_avatar_img"    property="toothAvatarImg" />
         <result    column="tooth_img"    property="toothImg" />
+        <result    column="tooth_code_img"    property="toothCodeImg" />
         <result    column="tooth_type"    property="toothType" />
         <result    column="tooth_status"    property="toothStatus" />
         <result    column="tooth_create_time"    property="toothCreateTime" />
@@ -27,6 +28,7 @@
         t.tooth_text,
         t.tooth_avatar_img,
         t.tooth_img,
+        t.tooth_code_img,
         t.tooth_type,
         t.tooth_status,
         t.tooth_create_time
@@ -94,6 +96,7 @@
         tooth_text,
         tooth_avatar_img,
         tooth_img,
+        tooth_code_img,
         tooth_type,
         tooth_status
         )
@@ -109,6 +112,7 @@
         #{toothText},
         #{toothAvatarImg},
         #{toothImg},
+        #{toothCodeImg},
         #{toothType},
         #{toothStatus}
         )

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/orderCustomizedMapper.xml

@@ -22,6 +22,7 @@
         <result    column="customized_text"    property="customizedText" />
         <result    column="customized_avatar_img"    property="customizedAvatarImg" />
         <result    column="customized_img"    property="customizedImg" />
+        <result    column="customized_code_img"    property="customizedCodeImg" />
         <result    column="customized_type"    property="customizedType" />
         <result    column="customized_status"    property="customizedStatus" />
         <result    column="customized_create_time"    property="customizedCreateTime" />
@@ -47,6 +48,7 @@
         t.customized_text,
         t.customized_avatar_img,
         t.customized_img,
+        t.customized_code_img,
         t.customized_type,
         t.customized_status,
         t.customized_create_time
@@ -107,6 +109,7 @@
         <result    column="customized_text"    property="customizedText" />
         <result    column="customized_avatar_img"    property="customizedAvatarImg" />
         <result    column="customized_img"    property="customizedImg" />
+        <result    column="customized_code_img"    property="customizedCodeImg" />
         <result    column="customized_type"    property="customizedType" />
         <result    column="customized_status"    property="customizedStatus" />
         <result    column="customized_create_time"    property="customizedCreateTime" />
@@ -165,6 +168,7 @@
             t.customized_text,
             t.customized_avatar_img,
             t.customized_img,
+            t.customized_code_img,
             t.customized_type,
             t.customized_status,
             t.customized_create_time,
@@ -261,6 +265,7 @@
         customized_text,
         customized_avatar_img,
         customized_img,
+        customized_code_img,
         customized_type,
         customized_status
         )
@@ -285,6 +290,7 @@
         #{customizedText},
         #{customizedAvatarImg},
         #{customizedImg},
+        #{customizedCodeImg},
         #{customizedType},
         #{customizedStatus}
         )