Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/Postage.java

@@ -29,7 +29,7 @@ public class Postage implements Serializable {
     //订单来源 销售渠道id
     private Integer postageOrderSource;
     //售后处理方式 3：换新  4：维修  5：补发  6：退货  7：无理由退货
-//    private Integer postageTreatmentMethod;
+    private Integer postageTreatmentMethod;
     //efast订单号
     private String salesOrderId;
     //客户姓名
@@ -119,6 +119,14 @@ public class Postage implements Serializable {
         this.postageOrderSource = postageOrderSource;
     }
 
+    public Integer getPostageTreatmentMethod() {
+        return postageTreatmentMethod;
+    }
+
+    public void setPostageTreatmentMethod(Integer postageTreatmentMethod) {
+        this.postageTreatmentMethod = postageTreatmentMethod;
+    }
+
     public String getSalesOrderId() {
         return salesOrderId;
     }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/customerInfoMapper.xml

@@ -521,7 +521,7 @@
         and cd.complete_cut_time < now()   AND cc.procTypeId = 3 and cd.detect_placeorder = 1  and detect_state != 32 AND detect_state != 36
       </if>
       <if test="afterState != null and afterState == 11">
-        and  cc.procTypeId = 2  AND cs.signclosed_is_receiving = 2 AND (soi.sales_shipping_status = 0 OR soi.sales_shipping_status is NULL) AND  soi.sales_status != 3
+        and  cc.procTypeId = 2  AND cs.signclosed_is_receiving = 2 AND ((soi.sales_shipping_status = 0 and soi.sales_status != 3) OR soi.sales_shipping_status is NULL)
       </if>
       <if test="warehouseDate != null">
         and cs.signclosed_date = #{warehouseDate}
@@ -1445,8 +1445,8 @@ LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
       tb_rst_product_info.product_name AS sendbackProductName,
       tb_rst_product_color.color_name AS sendbackColorName
        from tb_rst_cm_sendback_item
-      LEFT JOIN tb_rst_product_info on tb_rst_cm_sendback_item.sendback_product_id = tb_rst_product_info.product_id
       LEFT JOIN tb_rst_product_color on tb_rst_cm_sendback_item.sendback_color_id = tb_rst_product_color.color_id
+      LEFT JOIN tb_rst_product_info on tb_rst_product_color.color_product_id = tb_rst_product_info.product_id
       where sendback_id = #{sendbackId};
   </select>
 

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintDetectInfoMapper.xml

@@ -82,8 +82,8 @@
       cd.detect_buy_time detectBuytime
     from tb_rst_complaint_detect cd
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
-    LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
+    LEFT JOIN tb_rst_product_info pi ON ci.color_product_id = pi.product_id
     LEFT JOIN tb_rst_cm_relation cr ON cd.customer_id = cr.customer_id
     LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
     LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
@@ -192,10 +192,10 @@
     cd.detect_confirm_time detectConfirmTime,
     cd.detect_buy_time detectBuytime
     from tb_rst_complaint_detect cd
-    LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
     LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
     LEFT JOIN tb_rst_product_type pt on pi.product_type = pt.type_id
     LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
+    LEFT JOIN tb_rst_product_info pi ON ci.color_product_id  = pi.product_id
     LEFT JOIN tb_rst_cm_relation cr ON cd.customer_id = cr.customer_id
     LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
     LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
@@ -834,10 +834,10 @@
         cs.signclosed_send_name signclosedName,
         cd.detect_placeorder detectPlaceorder
         from tb_rst_complaint_detect cd
-        LEFT JOIN tb_rst_product_info pi ON cd.product_id = pi.product_id
         LEFT JOIN tb_rst_cm_question_describe qd on cd.customer_id = qd.customer_id
         LEFT JOIN tb_rst_product_type pt on pi.product_type = pt.type_id
         LEFT JOIN tb_rst_product_color ci on cd.product_color_id = ci.color_id
+        LEFT JOIN tb_rst_product_info pi ON ci.color_product_id = pi.product_id
         LEFT JOIN tb_rst_cm_relation cr ON cd.customer_id = cr.customer_id
         LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
         LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/complaintSignclosedInfoMapper.xml

@@ -79,7 +79,7 @@
     from
     tb_rst_complaint_awaiting_signclosed_product sp
     LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    LEFT JOIN tb_rst_product_info pi on pc.color_product_id = pi.product_id
     where sp.signclosed_id = #{signclosedId}
     GROUP BY sp.product_name,pc.color_name
   </select>
@@ -99,7 +99,7 @@
     from
     tb_rst_complaint_signclosed_product sp
     LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-    LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+    LEFT JOIN tb_rst_product_info pi on pc.color_product_id = pi.product_id
     where sp.signclosed_id = #{signclosedId}
     GROUP BY sp.product_name,pc.color_name
   </select>
@@ -377,7 +377,7 @@
         tb_rst_complaint_signclosed_product sp
         LEFT JOIN tb_rst_complaint_signclosed cs on cs.signclosed_id = sp.signclosed_id
         LEFT JOIN tb_rst_product_color pc on sp.signclosed_product_color = pc.color_id
-        LEFT JOIN tb_rst_product_info pi on sp.signclosed_product_id = pi.product_id
+        LEFT JOIN tb_rst_product_info pi on pc.color_product_id = pi.product_id
         where cs.signclosed_customer_id = #{customerId}
         GROUP BY sp.product_name,pc.color_name
     </select>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -124,6 +124,7 @@ public class AdminSalesOrderController {
         SalesOrder orderNum = salesOrderService.getStatusNum();//查询订单各个状态数量
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
+                .addNoPro("suSalesOrderItemList")
                 .setModelAndView(salesOrder, mv, "/admin/salesOrder/list_order_page", pagedResult);
 
         mv.addObject("orderNum",orderNum);

watero-rst-web/src/main/java/com/iamberry/rst/utils/StitchAttrUtil.java

@@ -36,7 +36,8 @@ public class StitchAttrUtil {
             "awaitingSignclosedProductInfoList",
             "signclosedProductInfoList",
             "cmRelation",
-            "signclosedImgInfoList"
+            "signclosedImgInfoList",
+            "suSalesOrderItemList"
     };