浏览代码

收款管理增加所属小程序

luolinsong 5 天之前
父节点
当前提交
08e77edde1

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

@@ -103,6 +103,9 @@ public interface FsStorePaymentScrmMapper
 //            "<if test = 'maps.createTime != null    '> " +
 //            "and DATE_FORMAT(p.create_time,'%Y-%m-%d') = DATE_FORMAT(#{maps.createTime},'%Y-%m-%d')  " +
 //            "</if>" +
+            "<if test = 'maps.appId != null    '> " +
+            "and p.app_id =#{maps.appId} " +
+            "</if>" +
             "<if test = 'maps.params != null and maps.params != \"\"   '> " +
             "<if test = 'maps.params.beginTime != null and maps.params.beginTime != \"\"   '> " +
             " AND date_format(p.pay_time,'%y%m%d') &gt;= date_format(#{maps.params.beginTime},'%y%m%d') " +

+ 4 - 3
fs-service/src/main/java/com/fs/hisStore/param/FsStorePaymentParam.java

@@ -46,10 +46,10 @@ public class FsStorePaymentParam  extends BaseEntity implements Serializable
     private String createTimeRange;
 
     private String[] createTimeList;
-    
+
     /** 退款审核状态 0-未审核 1-审核中 2-已审核 */
     private Integer refundAuditStatus;
-    
+
     /** 退款审核人 */
     private String refundAuditBy;
 
@@ -59,5 +59,6 @@ public class FsStorePaymentParam  extends BaseEntity implements Serializable
 
     /** 审核备注 **/
     private String refundAuditRemark;
-
+    /**所属小程序**/
+    private String appId;
 }

+ 4 - 2
fs-service/src/main/java/com/fs/hisStore/vo/FsStorePaymentVO.java

@@ -88,7 +88,7 @@ public class FsStorePaymentVO implements Serializable
     private String title;
 
     private String payMode;
-    
+
     /** 退款审核状态 0-待审核 1-审核通过 2-审核拒绝 */
     @Excel(name = "退款审核状态")
     private Integer refundAuditStatus;
@@ -105,4 +105,6 @@ public class FsStorePaymentVO implements Serializable
     /** 退款审核备注 */
     @Excel(name = "退款审核备注")
     private String refundAuditRemark;
-}
+    /**所属小程序**/
+    private String appId;
+}