diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 7cafa68c4..ca4d195b5 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -55,9 +55,9 @@ public class WxCardPayController extends BaseController { @ApiOperation("C端扫B端储值卡交易流水SUM") @GetMapping("sum") - public ResultData sumCardOrderList(@ModelAttribute WxCardSpendVo wxCardSpend) { + public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { String ipStr = getIpAddr(); - logger.info("sumCardOrderList: " + ipStr + " :" + wxCardSpend.toString()); + logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); WxMerchantBUser user = getUser(); wxCardSpend.setTenantId(user.getTenantId()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java index 063771130..f2f4866e5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -142,7 +142,7 @@ public class WxCardPayController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData cardOrderList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { + public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("saveCardPayOrder: " + ipStr + " :" + wxCardSpend.toString()); if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); @@ -151,4 +151,16 @@ public class WxCardPayController extends BaseController { final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); return new ResultData(page); } + + @ApiOperation("C端扫B端储值卡交易流水SUM接口") + @GetMapping("sum") + public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { + String ipStr = getIpAddr(); + logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); + if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); + WxCUser user = getUser(); + wxCardSpend.setTenantId(user.getTenantId()); + final Map map = wxCardSpendService.sumCardSpend(wxCardSpend); + return new ResultData(map); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java index 284a84909..9fd781e53 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardSpend.java @@ -67,6 +67,10 @@ public class WxCardSpend implements Serializable { @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + /**状态*/ + @io.swagger.annotations.ApiModelProperty(value="状态(0:未分帐,1:已分账)",name="payStatus") + private Integer payStatus; + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") @@ -84,6 +88,7 @@ public class WxCardSpend implements Serializable { ,CardBeforeRealAmount_ASC("`card_before_real_amount` ASC"),CardBeforeRealAmount_DESC("`card_before_real_amount` DESC") ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") + ,Status_ASC("`pay_status` ASC"),Status_DESC("`pay_status` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java index 5d175017c..bf1375156 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardSpendMapper.java @@ -9,6 +9,8 @@ public interface WxCardSpendMapper extends CommonMapper { List findList(WxCardSpend wxCardSpend); + int updateByCond(WxCardSpend wxCardSpend); + List findCardSpendVoList(WxCardSpend wxCardSpend); Map sumCardSpendVo(WxCardSpend wxCardSpend); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java index c90856231..e4a6ab493 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java @@ -9,6 +9,8 @@ public interface WxMerchantSubsidyMapper extends CommonMapper findList(WxMerchantSubsidy wxMerchantSubsidy); + int updateByCond(WxMerchantSubsidy wxMerchantSubsidy); + List findVoList(WxMerchantSubsidy wxMerchantSubsidy); Map sumVoList(WxMerchantSubsidy wxMerchantSubsidy); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java index 6f7118eaa..a5ea847d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java @@ -41,6 +41,13 @@ public interface WxMerchantSubsidyService { */ ResultData saveOrUpdate(WxMerchantSubsidy record); + /** + * 更新实体 + * + * @param record + */ + ResultData update(WxMerchantSubsidy record); + /** * 根据Id删除实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 459946e38..87cfa7716 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -197,7 +197,18 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } // 9. 分账 - shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); + try { + shareForCardPay(record.getTenantId(), record.getCardId(), record.getOrderId(), record.getId()); + } catch (MallinkException e) { + logger.error(e.getMessage()); + if(ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode()) { + // 分账已到20次限制,后面只记录,无法分账 + logger.error("分账已到20次限制,后面只记录,无法分账"); + } else { + throw new MallinkException(e.getErrorCode(), e.getMessage()); + } + } + return new ResultData(record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 0a0844672..230ea0a16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -49,6 +49,12 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { return new ResultData(); } + @Override + public ResultData update(WxMerchantSubsidy record) { + int num = wxMerchantSubsidyMapper.updateByCond(record); + return new ResultData(num); + } + @Override public void deleteById(Long id) { wxMerchantSubsidyMapper.deleteByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 136a3b228..9a8be88b6 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -17,11 +17,13 @@ + `id`,`tenant_id`,`card_id`,`owner_id`,`merchant_id`,`order_id`,`deduction_amount`,`payment`,`real_payment`, - `card_remain_amount`,`card_before_amount`,`card_remain_real_amount`,`card_before_real_amount`,`create_date`,`update_date` + `card_remain_amount`,`card_before_amount`,`card_remain_real_amount`,`card_before_real_amount`, + `create_date`,`update_date`, `pay_status` @@ -71,6 +73,9 @@ and `update_date` = #{updateDate} + + and `pay_status` = #{payStatus} + and `create_date` between #{startdate} and #{enddate} @@ -88,6 +93,12 @@ + + @@ -105,6 +116,7 @@ + @@ -120,10 +132,11 @@ cs.`id`,cs.`tenant_id`,cs.`card_id`,cs.`owner_id`,cs.`merchant_id`,cs.`order_id`,cs.`deduction_amount`,cs.`payment`,cs.`real_payment`, - cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`,cs.`create_date`,cs.`update_date`, + cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`, + cs.`create_date`,cs.`update_date`, cs.`pay_status` m.`name`, c.`title`, ms.`subsidy`,ms.`real_subsidy`,ms.`status`, - ou.`nick_name` as onick_name, ou.`phone` as ou_phone + ou.`nick_name` as onick_name, ou.`phone` as ou_phone @@ -173,6 +186,12 @@ and cs.`update_date` = #{updateDate} + + and cs.`pay_status` = #{payStatus} + + + and ms.`status` = #{status} + and ou.`phone` = #{ouPhone} @@ -203,7 +222,9 @@ select IFNULL(SUM(cs.`deduction_amount`),0) as sum_deduction_amount, IFNULL(SUM(cs.`payment`),0) as sum_payment, - IFNULL(SUM(cs.`real_payment`),0) as sum_real_payment + IFNULL(SUM(cs.`real_payment`),0) as sum_real_payment, + IFNULL(SUM(ms.`subsidy`), 0) as sum_subsidy, + IFNULL(SUM(ms.`real_subsidy`), 0) as sum_real_subsidy from wx_card_spend cs left join wx_coupon_order co on co.id = cs.card_id left join wx_coupon c on c.id = co.coupon_id diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 8f5b5f7a6..375884ce0 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -83,6 +83,12 @@ + +