Просмотр исходного кода

商城订单 添加商城类型

xgb 2 недель назад
Родитель
Сommit
8ef03cc3be

+ 3 - 0
fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -176,6 +176,9 @@ public interface FsStoreOrderScrmMapper
             "<if test='maps.auditStatus !=null '>" +
             "AND fsoa.audit_status = #{maps.auditStatus} " +
             "</if>" +
+            "<if test = 'maps.mimiType != null    '> " +
+            "and o.mimi_type =#{maps.mimiType} " +
+            "</if>" +
             "<if test = 'maps.deptId != null    '> " +
             "  AND (o.dept_id = #{maps.deptId} OR o.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) )) " +
             "</if>" +

+ 3 - 0
fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderParam.java

@@ -97,4 +97,7 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
     /* 审核状态 */
     private Integer auditStatus;
 
+    /* 商城类型 1-制单小程序 2-公域小程序 */
+    private Integer mimiType;
+
 }

+ 2 - 0
fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderVO.java

@@ -255,5 +255,7 @@ public class FsStoreOrderVO implements Serializable
     // 实收金额 线下加线上金额合计
     private BigDecimal totalPayMoney;
 
+    /* 商城类型 1-制单小程序 2-公域小程序 */
+    private Integer mimiType;
 
 }