diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java index a7c723075..c41b34aa5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java @@ -123,7 +123,11 @@ public class WxCashBackActivityController extends BaseController { a.setAuditingRecordSum(auditingRecordSum); a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); - a.setMerchantCount(wxCashBackActivityService.getMerchantCount(a)); + if (a.getAllMerchant().intValue() == EnumYesOrNo.YES.getCode().intValue()) { + a.setMerchantCount("全部"); + }else { + a.setMerchantCount(String.valueOf(wxCashBackActivityService.getMerchantCount(a))); + } r.setAuditStatus(null); BigDecimal mrchantSum = wxCashBackActivityService.getRecordMerchantSum(r); diff --git a/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql b/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql index 1ad9fee71..ba2c27e07 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V20240200001.sql @@ -43,7 +43,7 @@ CREATE TABLE `wx_cash_back_activity_record` ( `phone` varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '客户电话', `address` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '客户地址', `audit_remark` varchar(300) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '审批意见', - `audit_status` int(1) DEFAULT NULL COMMENT '审批状态', + `audit_status` int(1) NOT NULL DEFAULT '0' COMMENT '审批状态', `cash_rate` decimal(10,3) DEFAULT NULL COMMENT '返现比率', `cash_money` decimal(10,3) DEFAULT NULL COMMENT '返现金额', `mall_cash_money` decimal(10,3) DEFAULT NULL COMMENT '商管承担返现金额', diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java index 0c2a272fc..19ef9e6ab 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java @@ -46,7 +46,7 @@ public class WxCashBackActivity extends TenantEntity { @TableField(exist = false) private Integer recordCount; @TableField(exist = false) - private Integer merchantCount; + private String merchantCount; @TableField(exist = false) private BigDecimal auditSuccessRecordSum; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java index 926df57ec..55a11af30 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java @@ -127,6 +127,9 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService } private void handerRecordPageData(TenantEntity tenantEntity,List recordList) { + if (null == recordList || recordList.size() <=0 ) { + return; + } List aidList = new ArrayList(); List midList = new ArrayList(); List itemIdList = new ArrayList(); diff --git a/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml index c141801fe..f54e347ec 100644 --- a/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml @@ -60,7 +60,7 @@ and start_time >= now() - + and `name` like concat('%', #{name},'%')