Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
1126fe2a15
5 changed files with 11 additions and 4 deletions
  1. +5
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V20240200001.sql
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml

+ 5
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java View File

@@ -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);


+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V20240200001.sql View File

@@ -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 '商管承担返现金额',


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java View File

@@ -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)


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java View File

@@ -127,6 +127,9 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService
}
private void handerRecordPageData(TenantEntity tenantEntity,List<WxCashBackActivityRecord> recordList) {
if (null == recordList || recordList.size() <=0 ) {
return;
}
List<Long> aidList = new ArrayList<Long>();
List<Long> midList = new ArrayList<Long>();
List<Long> itemIdList = new ArrayList<Long>();


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCashBackActivityMapper.xml View File

@@ -60,7 +60,7 @@
and start_time &gt;= now()
</if>

<if test=" null != name ">
<if test=" null != name and name != '' ">
and `name` like concat('%', #{name},'%')
</if>


Loading…
Cancel
Save