| @@ -116,13 +116,13 @@ public class WxCashBackActivityController extends BaseController { | |||||
| a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); | a.setAuditSuccessRecordSumRough(successRecordSum.setScale(0,BigDecimal.ROUND_HALF_UP)); | ||||
| r.setAuditStatus(EnumCashBackActivityRecordStatus.AUDTING.getCode()); | 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()) { | if (a.getAllMerchant().intValue() == EnumYesOrNo.YES.getCode().intValue()) { | ||||
| a.setMerchantCount("全部"); | a.setMerchantCount("全部"); | ||||
| @@ -52,9 +52,7 @@ public class WxCashBackActivity extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private BigDecimal auditSuccessRecordSumRough; | private BigDecimal auditSuccessRecordSumRough; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private BigDecimal auditingRecordSum; | |||||
| @TableField(exist = false) | |||||
| private BigDecimal auditingRecordSumRough; | |||||
| private Integer auditingCount; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private BigDecimal merchantRecordSum; | private BigDecimal merchantRecordSum; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -23,8 +23,8 @@ public class WxCashBackActivityRecord extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "活动", name = "activityId") | @io.swagger.annotations.ApiModelProperty(value = "活动", name = "activityId") | ||||
| private Long activityId; | private Long activityId; | ||||
| @TableField(exist = false) | |||||
| @Excel(name="活动名称",width = 20,orderNum = "1") | @Excel(name="活动名称",width = 20,orderNum = "1") | ||||
| @TableField(exist = false) | |||||
| private String activityName; | private String activityName; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @@ -346,6 +346,7 @@ public class WxCashBackActivityServiceImpl implements WxCashBackActivityService | |||||
| @Override | @Override | ||||
| public void auditRecord(WxCashBackActivityRecord record) { | public void auditRecord(WxCashBackActivityRecord record) { | ||||
| record.setUpdateDate(new Date()); | |||||
| wxCashBackActivityRecordMapper.updateStatus(record); | wxCashBackActivityRecordMapper.updateStatus(record); | ||||
| } | } | ||||
| @@ -60,15 +60,15 @@ | |||||
| and `create_date` <= #{createDateEnd} | and `create_date` <= #{createDateEnd} | ||||
| </if> | </if> | ||||
| <if test=" null != cusName "> | |||||
| <if test=" null != cusName and cusName != '' "> | |||||
| and `cus_name` like concat('%', #{cusName},'%') | and `cus_name` like concat('%', #{cusName},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != phone "> | |||||
| <if test=" null != phone and phone != '' "> | |||||
| and `phone` like concat('%', #{phone},'%') | and `phone` like concat('%', #{phone},'%') | ||||
| </if> | </if> | ||||
| <if test=" null != orderNo "> | |||||
| <if test=" null != orderNo and orderNo != '' "> | |||||
| and `order_no` like concat('%', #{orderNo},'%') | and `order_no` like concat('%', #{orderNo},'%') | ||||
| </if> | </if> | ||||
| @@ -133,6 +133,9 @@ | |||||
| <if test=" null != merchantCashMoney"> | <if test=" null != merchantCashMoney"> | ||||
| `merchant_cash_money` = #{merchantCashMoney}, | `merchant_cash_money` = #{merchantCashMoney}, | ||||
| </if> | </if> | ||||
| <if test=" null != itemId"> | |||||
| `item_id` = #{itemId}, | |||||
| </if> | |||||
| `update_date` = #{updateDate} | `update_date` = #{updateDate} | ||||
| where id=#{id} | where id=#{id} | ||||
| <if test=" null != tenantId and '' != tenantId"> | <if test=" null != tenantId and '' != tenantId"> | ||||