winter 2 лет назад
Родитель
Сommit
9f9db17088
5 измененных файлов: 15 добавлений и 13 удалений
  1. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java
  2. +1
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java
  4. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java
  5. +6
    -3
      mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml

+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCashBackActivityController.java Просмотреть файл

@@ -116,13 +116,13 @@ public class WxCashBackActivityController extends BaseController {
a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP));
r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode());
BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r);
if (null == auditingRecordSum) {
auditingRecordSum = new BigDecimal(0);
}
a.setAuditingRecordSum(auditingRecordSum);
a.setAuditingRecordSumRough(auditingRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP));
// BigDecimal auditingRecordSum = wxCashBackActivityService.getRecordSum(r);
// if (null == auditingRecordSum) {
// auditingRecordSum = new BigDecimal(0);
// }
int auditingCount = wxCashBackActivityService.getRecordCount(r);
a.setAuditingCount(auditingCount);
if (a.getAllMerchant().intValue() == EnumYesOrNo.YES.getCode().intValue()) {
a.setMerchantCount("全部");


+ 1
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivity.java Просмотреть файл

@@ -52,9 +52,7 @@ public class WxCashBackActivity extends TenantEntity {
@TableField(exist = false)
private BigDecimal auditSuccessRecordSumRough;
@TableField(exist = false)
private BigDecimal auditingRecordSum;
@TableField(exist = false)
private BigDecimal auditingRecordSumRough;
private Integer auditingCount;
@TableField(exist = false)
private BigDecimal merchantRecordSum;
@TableField(exist = false)


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCashBackActivityRecord.java Просмотреть файл

@@ -23,8 +23,8 @@ public class WxCashBackActivityRecord extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value = "活动", name = "activityId")
private Long activityId;
@TableField(exist = false)
@Excel(name="活动名称",width = 20,orderNum = "1")
@TableField(exist = false)
private String activityName;
@io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId")
private Long merchantId;


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCashBackActivityServiceImpl.java Просмотреть файл

@@ -346,6 +346,7 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService

@Override
public void auditRecord(WxCashBackActivityRecord record) {
record.setUpdateDate(new Date());
wxCashBackActivityRecordMapper.updateStatus(record);
}



+ 6
- 3
mallinkService/src/main/resources/mapper/WxCashBackActivityRecordMapper.xml Просмотреть файл

@@ -60,15 +60,15 @@
and `create_date` <= #{createDateEnd}
</if>

<if test=" null != cusName ">
<if test=" null != cusName and cusName != '' ">
and `cus_name` like concat('%', #{cusName},'%')
</if>
<if test=" null != phone ">
<if test=" null != phone and phone != '' ">
and `phone` like concat('%', #{phone},'%')
</if>
<if test=" null != orderNo ">
<if test=" null != orderNo and orderNo != '' ">
and `order_no` like concat('%', #{orderNo},'%')
</if>
@@ -133,6 +133,9 @@
<if test=" null != merchantCashMoney">
`merchant_cash_money` = #{merchantCashMoney},
</if>
<if test=" null != itemId">
`item_id` = #{itemId},
</if>
`update_date` = #{updateDate}
where id=#{id}
<if test=" null != tenantId and '' != tenantId">


Загрузка…
Отмена
Сохранить