From 43473c1dbbb9251661665267e0dcffde4a70f3e5 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 30 Oct 2020 18:29:01 +0800 Subject: [PATCH 01/12] fix bug --- .../iformall/controller/market/WxCardPayController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 43c96b44e..e133f71ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -148,10 +148,6 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); wxCardSpendService.exportData(wxCardSpendVo, request, response); } @@ -232,6 +228,10 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpendVo.setSources(sources); + wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); wxCardSpendService.exportData(wxCardSpendVo, request, response); } From f0a2d88fea78ae7015646bbaad44461d20aa9d4f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 09:35:22 +0800 Subject: [PATCH 02/12] fix bug --- .../com/iformall/controller/market/WxCardPayController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index e133f71ca..e42d4b5d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -107,9 +107,9 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpendVo.setSources(sources); + //List sources = new ArrayList(); + //sources.add(EnumMerchantSubsidySource.CARD.getCode()); + //wxCardSpendVo.setSources(sources); wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); From 940cfbb6d18bc89e71b05b845991c0c1ce0d36aa Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 09:57:20 +0800 Subject: [PATCH 03/12] fix bug --- .../com/iformall/controller/market/WxCardPayController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index e42d4b5d2..e5c159d42 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -110,7 +110,7 @@ public class WxCardPayController extends BaseController { //List sources = new ArrayList(); //sources.add(EnumMerchantSubsidySource.CARD.getCode()); //wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + //wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } From 86504c49b05e0882f7ceb8180a34de82f711f83f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 11:22:59 +0800 Subject: [PATCH 04/12] fix --- .../market/WxCardPayController.java | 8 +-- .../service/impl/WxCardSpendServiceImpl.java | 50 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index e5c159d42..e133f71ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -107,10 +107,10 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } - //List sources = new ArrayList(); - //sources.add(EnumMerchantSubsidySource.CARD.getCode()); - //wxCardSpendVo.setSources(sources); - //wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpendVo.setSources(sources); + wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } 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 3bd92e47c..b1f2b1673 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -246,30 +246,30 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } //卡不再调用微信分账 -// if (payAccount.checkShare()) { -// // 分账 -// if (cardInfo.getSaleAmount() > 0) { -// // 9. 只有有价卡才能分账 -// try { -// shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId(),payWay.getCode()); -// } catch (MallinkException e) { -// logger.error(e.getMessage()); -// if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode() || -// ErrorCode.PROFIT_SHARING_TIME_EXPIRED.getCode() == e.getErrorCode()) { -// // 分账已到20次限制,后面只记录,不分账 -// // 分账已过期,后面只记录,不分账 -// logger.error("分账已到20次限制,后面只记录,无法分账"); -// try { -// creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); -// } catch (Exception ex) { -// logger.error("分账已到20次限制,记录到结算表失败"); -// } -// } else { -// throw new MallinkException(e.getErrorCode(), e.getMessage()); -// } -// } -// } -// } else { + if (payAccount.checkShare()) { + // 分账 + if (cardInfo.getSaleAmount() > 0) { + // 9. 只有有价卡才能分账 + try { + shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId(),payWay.getCode()); + } catch (MallinkException e) { + logger.error(e.getMessage()); + if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode() || + ErrorCode.PROFIT_SHARING_TIME_EXPIRED.getCode() == e.getErrorCode()) { + // 分账已到20次限制,后面只记录,不分账 + // 分账已过期,后面只记录,不分账 + logger.error("分账已到20次限制,后面只记录,无法分账"); + try { + creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); + } catch (Exception ex) { + logger.error("分账已到20次限制,记录到结算表失败"); + } + } else { + throw new MallinkException(e.getErrorCode(), e.getMessage()); + } + } + } + } else { // 有价储值卡消费时,如果未启用分账,金额也记入补贴表,可能会导致查询错误, TODO if (cardInfo.getSaleAmount() > 0 && payment > 0) { try { @@ -278,7 +278,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { logger.error("记录到结算表失败"); } } -// } + } // 成长值 try { From a4dc01f547bdebdda6356b0332b299352b97c2ff Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 11:30:09 +0800 Subject: [PATCH 05/12] fix bug --- .../iformall/controller/market/WxCardPayController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index e133f71ca..5e9ce9574 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -107,10 +107,10 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); +// List sources = new ArrayList(); +// sources.add(EnumMerchantSubsidySource.CARD.getCode()); +// wxCardSpendVo.setSources(sources); +// wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } From c02fc06a5d6955c58e884af9ef63db100e6bd208 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 16:23:25 +0800 Subject: [PATCH 06/12] fix bug --- .../com/iformall/controller/market/WxCardPayController.java | 4 ++-- .../main/java/com/iformall/domain/po/WxMerchantSubsidy.java | 3 +++ .../src/main/java/com/iformall/domain/vo/WxCardSpendVo.java | 4 ++-- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 5 ++++- .../src/main/resources/mapper/WxCardSpendMapper.xml | 4 ++-- .../src/main/resources/mapper/WxMerchantSubsidyMapper.xml | 3 ++- 6 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index e133f71ca..6a9c3b319 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -110,7 +110,7 @@ public class WxCardPayController extends BaseController { List sources = new ArrayList(); sources.add(EnumMerchantSubsidySource.CARD.getCode()); wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + wxCardSpendVo.setCardSpendListShow(1); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } @@ -231,7 +231,7 @@ public class WxCardPayController extends BaseController { List sources = new ArrayList(); sources.add(EnumMerchantSubsidySource.CARD.getCode()); wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + wxCardSpendVo.setCardSpendListShow(1); wxCardSpendService.exportData(wxCardSpendVo, request, response); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 7a888af6f..d189637ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -98,6 +98,9 @@ public class WxMerchantSubsidy extends TenantEntity { @Excel(name = "冻结状态", width = 20, orderNum = "8", replace = {"冻结中_1", "正常_0", " _-1"}) @io.swagger.annotations.ApiModelProperty(value = "是否冻结", name = "freeze") private Integer freeze; + + @io.swagger.annotations.ApiModelProperty(value="是否展示在卡消费列表 1-展示 0-不展示",name="cardSpendListShow") + private Integer cardSpendListShow; public String getOrderPaymentStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index aedbad4c2..1d10033ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -44,8 +44,8 @@ public class WxCardSpendVo extends WxCardSpend { @TableField(exist = false) private List sources; - @io.swagger.annotations.ApiModelProperty(value="账单类型",name="subsidyType") + @io.swagger.annotations.ApiModelProperty(value="是否显示在卡消费订单",name="cardSpendListShow") @TableField(exist = false) - private Integer subsidyType; + private Integer cardSpendListShow; } 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 776679cfb..36a4e1514 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -231,10 +231,13 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 未补贴 merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); } - + merchantSubsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); + //如果是有价卡,并且有补贴,则该记录不能显示在卡消费列表里面 + merchantSubsidy.setCardSpendListShow(0); + merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); try { diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index dd6bb4b9a..c89f2e890 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -392,8 +392,8 @@ - - and ms.type = #{subsidyType} + + and ( ms.card_spend_list_show is null or ms.card_spend_list_show = #{cardSpendListShow} ) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 89df56004..a05cd8195 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -21,11 +21,12 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source + `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source,card_spend_list_show From 9b1bfa2cbe69950801717c8ecba20f78b2727f1f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 16:50:54 +0800 Subject: [PATCH 07/12] fix bug --- .../com/iformall/controller/market/WxCardPayController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 6a9c3b319..a080e1e2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -125,6 +125,10 @@ public class WxCardPayController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } wxCardSpend.updateTenantInfo(getTenantInfo()); + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpend.setSources(sources); + wxCardSpend.setCardSpendListShow(1); final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); return new ResultData(mapList); } From f0ea602dab5796a27cdad4729d76ccb932f5041a Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 16:54:39 +0800 Subject: [PATCH 08/12] fix bug --- .../com/iformall/controller/market/WxCardPayController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 6a9c3b319..a080e1e2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -125,6 +125,10 @@ public class WxCardPayController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } wxCardSpend.updateTenantInfo(getTenantInfo()); + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpend.setSources(sources); + wxCardSpend.setCardSpendListShow(1); final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); return new ResultData(mapList); } From fc6db765c7f779144927d6ff14d282417ec27072 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 17:03:14 +0800 Subject: [PATCH 09/12] fix bug --- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 36a4e1514..dd79886f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -236,7 +236,10 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); //如果是有价卡,并且有补贴,则该记录不能显示在卡消费列表里面 - merchantSubsidy.setCardSpendListShow(0); + if (cardInfo.getSaleAmount()>0 && subsidyFee > 0) { + merchantSubsidy.setCardSpendListShow(0); + } + merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); From 4ea8ca6041b4abee14bb52326b84b4469a21a1d9 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 2 Nov 2020 17:40:56 +0800 Subject: [PATCH 10/12] fix bug --- .../service/impl/WxCardSpendServiceImpl.java | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) 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 4f9a1735a..15ff2234f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -252,30 +252,30 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { } //卡不再调用微信分账 - if (payAccount.checkShare()) { - // 分账 - if (cardInfo.getSaleAmount() > 0) { - // 9. 只有有价卡才能分账 - try { - shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId(),payWay.getCode()); - } catch (MallinkException e) { - logger.error(e.getMessage()); - if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode() || - ErrorCode.PROFIT_SHARING_TIME_EXPIRED.getCode() == e.getErrorCode()) { - // 分账已到20次限制,后面只记录,不分账 - // 分账已过期,后面只记录,不分账 - logger.error("分账已到20次限制,后面只记录,无法分账"); - try { - creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); - } catch (Exception ex) { - logger.error("分账已到20次限制,记录到结算表失败"); - } - } else { - throw new MallinkException(e.getErrorCode(), e.getMessage()); - } - } - } - } else { +// if (payAccount.checkShare()) { +// // 分账 +// if (cardInfo.getSaleAmount() > 0) { +// // 9. 只有有价卡才能分账 +// try { +// shareForCardPay(record, record.getCardId(), record.getOrderId(), record.getId(),payWay.getCode()); +// } catch (MallinkException e) { +// logger.error(e.getMessage()); +// if (ErrorCode.PROFIT_SHARING_NUM_UP_LIMIT.getCode() == e.getErrorCode() || +// ErrorCode.PROFIT_SHARING_TIME_EXPIRED.getCode() == e.getErrorCode()) { +// // 分账已到20次限制,后面只记录,不分账 +// // 分账已过期,后面只记录,不分账 +// logger.error("分账已到20次限制,后面只记录,无法分账"); +// try { +// creteMerchantSubsidy(record, curDate, idWorker, coupon, payment); +// } catch (Exception ex) { +// logger.error("分账已到20次限制,记录到结算表失败"); +// } +// } else { +// throw new MallinkException(e.getErrorCode(), e.getMessage()); +// } +// } +// } +// } else { // 有价储值卡消费时,如果未启用分账,金额也记入补贴表,可能会导致查询错误, TODO if (cardInfo.getSaleAmount() > 0 && payment > 0) { try { @@ -284,7 +284,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { logger.error("记录到结算表失败"); } } - } +// } // 成长值 try { From 05ae7fe79813a0063f7c45f6936bc3c20d902be5 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 3 Nov 2020 10:35:12 +0800 Subject: [PATCH 11/12] fix bug --- .../main/java/com/iformall/controller/WxPayOrderController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index d0611521a..8a612f9fd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -165,10 +165,12 @@ public class WxPayOrderController extends BaseController { WxPayOrder payOrder = new WxPayOrder(); payOrder.setId(payOrderId); + payOrder.setPayOrderNo(String.valueOf(payOrderId)); payOrder.setOrderId(orderId); payOrder.setPayOrderStatus(status); payOrder.setFailReason(reasonStr); payOrder.updateTenantInfo(getTenantInfo()); + payOrder.setPayVendor(EnumPayWay.PAY_WAY_WECHAT.getCode()); try { //有价券支付成功 From 3dbfd5c6fe5715557894e23774bf5e8d8a5017fe Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 3 Nov 2020 11:05:28 +0800 Subject: [PATCH 12/12] fix bug --- .../iformall/controller/WxCuserFloatingLayerController.java | 2 +- .../com/iformall/service/WxCuserFloatingLayerService.java | 2 +- .../service/impl/WxCuserFloatingLayerServiceImpl.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java index b9d4eb9c4..88b4c7c03 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java @@ -35,7 +35,7 @@ public class WxCuserFloatingLayerController extends BaseController { @ApiImplicitParam(name = "openId", value = "openId", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)}) public ResultData getAppIcon(String openId, String appId) { - WxFloatingLayer wxFloatingLayer = wxCuserFloatingLayerService.getFloatingLayer(openId, appId,getTenantInfo()); + WxFloatingLayer wxFloatingLayer = wxCuserFloatingLayerService.getFloatingLayer(openId, appId); return new ResultData(Result.SUCCESS, "查询成功", wxFloatingLayer); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java b/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java index 675a2c2ef..96a29997a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java @@ -8,6 +8,6 @@ import com.iformall.domain.po.base.TenantEntity; */ public interface WxCuserFloatingLayerService { - WxFloatingLayer getFloatingLayer(String openId, String appId,TenantEntity tenantinfo); + WxFloatingLayer getFloatingLayer(String openId, String appId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java index 4dfac380c..2217fba53 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java @@ -41,15 +41,15 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ @Override - public WxFloatingLayer getFloatingLayer(String openId, String appId,TenantEntity tenantinfo) { + public WxFloatingLayer getFloatingLayer(String openId, String appId) { + WxAppinfo appinfo = appinfoMapper.findByAppId(appId); //1 查看是否存在用户,用户不存在 直接返回浮层信息 WxCUser user = new WxCUser(); user.setOpenId(openId); user.setAppId(appId); - user.setTenantId(tenantinfo.getTenantId()); + user.updateTenantInfo(appinfo); WxCUser byOpenId = wxCUserMapper.findByOpenId(user); if (byOpenId == null) { - WxAppinfo appinfo = appinfoMapper.findByAppId(appId); return getWxFloatingLayer(appinfo.getTenantInfo()); } //2 用户存在 查看是否已有弹出记录 没有 保存记录后返回浮层信息