| @@ -54,10 +54,10 @@ public class AppTest { | |||||
| paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id | paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id | ||||
| paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 | paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 | ||||
| // paramMap.put("shopName","百丽");//门店名称 | // paramMap.put("shopName","百丽");//门店名称 | ||||
| paramMap.put("userNumber","564603843541262336");//***会员Id | |||||
| paramMap.put("userNumber","516625539215818752");//***会员Id | |||||
| // paramMap.put("userPhone","18872592633");//会员手机号 | // paramMap.put("userPhone","18872592633");//会员手机号 | ||||
| paramMap.put("timeEnd","2021-06-16 15:28:00");//***付款时间(yyyy-MM-dd HH:mm:ss) | |||||
| paramMap.put("amount","1000");//***付款金额(分) | |||||
| paramMap.put("timeEnd","2021-07-20 14:18:00");//***付款时间(yyyy-MM-dd HH:mm:ss) | |||||
| paramMap.put("amount","1800");//***付款金额(分) | |||||
| // paramMap.put("summary","");//付款摘要 | // paramMap.put("summary","");//付款摘要 | ||||
| /** | /** | ||||
| @@ -174,6 +174,13 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder | |||||
| redisLock.unlock(lockKey, timeStr); | redisLock.unlock(lockKey, timeStr); | ||||
| return new ResultData(0); | return new ResultData(0); | ||||
| } | } | ||||
| try { | |||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA); | |||||
| } catch (Exception e) { | |||||
| logger.error("支付发券: " + e.getMessage()); | |||||
| } | |||||
| Integer businessId = EnumBusiness.BUSINESS_ID6.getCode(); | Integer businessId = EnumBusiness.BUSINESS_ID6.getCode(); | ||||
| if(wxMerchant != null){ | if(wxMerchant != null){ | ||||
| businessId = wxMerchant.getBusinessId(); | businessId = wxMerchant.getBusinessId(); | ||||
| @@ -203,12 +210,6 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder | |||||
| record.setPointsUpdateTime(creditHistory.getCreateDate()); | record.setPointsUpdateTime(creditHistory.getCreateDate()); | ||||
| this.updatePoints(record); | this.updatePoints(record); | ||||
| try { | |||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA); | |||||
| } catch (Exception e) { | |||||
| logger.error("支付发券: " + e.getMessage()); | |||||
| } | |||||
| redisLock.unlock(lockKey, timeStr); | redisLock.unlock(lockKey, timeStr); | ||||
| return new ResultData(creditNum); | return new ResultData(creditNum); | ||||
| } | } | ||||
| @@ -168,8 +168,16 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe | |||||
| } | } | ||||
| wxBusinessCircleOrderMapper.insertNoticeOrder(record); | wxBusinessCircleOrderMapper.insertNoticeOrder(record); | ||||
| Integer creditNum = 0; | Integer creditNum = 0; | ||||
| if(record.getCUserId() != null){ | if(record.getCUserId() != null){ | ||||
| try { | |||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA); | |||||
| } catch (Exception e) { | |||||
| logger.error("支付发券: " + e.getMessage()); | |||||
| } | |||||
| Integer businessId = EnumBusiness.BUSINESS_ID6.getCode(); | Integer businessId = EnumBusiness.BUSINESS_ID6.getCode(); | ||||
| if(wxMerchant != null){ | if(wxMerchant != null){ | ||||
| businessId = wxMerchant.getBusinessId(); | businessId = wxMerchant.getBusinessId(); | ||||
| @@ -199,12 +207,6 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe | |||||
| record.setPointsUpdateTime(creditHistory.getCreateDate()); | record.setPointsUpdateTime(creditHistory.getCreateDate()); | ||||
| this.updatePoints(record); | this.updatePoints(record); | ||||
| try { | |||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA); | |||||
| } catch (Exception e) { | |||||
| logger.error("支付发券: " + e.getMessage()); | |||||
| } | |||||
| if(StringUtils.isNotBlank(record.getNoticeId())){ | if(StringUtils.isNotBlank(record.getNoticeId())){ | ||||
| //同步积分 | //同步积分 | ||||
| wxCallBackService.notifyPoints(record); | wxCallBackService.notifyPoints(record); | ||||
| @@ -176,6 +176,13 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService | |||||
| redisLock.unlock(lockKey, timeStr); | redisLock.unlock(lockKey, timeStr); | ||||
| return new ResultData(0); | return new ResultData(0); | ||||
| } | } | ||||
| try { | |||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA); | |||||
| } catch (Exception e) { | |||||
| logger.error("支付发券: " + e.getMessage()); | |||||
| } | |||||
| Integer businessId = EnumBusiness.BUSINESS_ID6.getCode(); | Integer businessId = EnumBusiness.BUSINESS_ID6.getCode(); | ||||
| if(wxMerchant != null){ | if(wxMerchant != null){ | ||||
| businessId = wxMerchant.getBusinessId(); | businessId = wxMerchant.getBusinessId(); | ||||
| @@ -205,12 +212,6 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService | |||||
| record.setPointsUpdateTime(creditHistory.getCreateDate()); | record.setPointsUpdateTime(creditHistory.getCreateDate()); | ||||
| this.updatePoints(record); | this.updatePoints(record); | ||||
| try { | |||||
| wxCouponSendService.sendCouponToUser(EnumCouponSendSendType.B_MICROPAY, record,EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA); | |||||
| } catch (Exception e) { | |||||
| logger.error("支付发券: " + e.getMessage()); | |||||
| } | |||||
| redisLock.unlock(lockKey, timeStr); | redisLock.unlock(lockKey, timeStr); | ||||
| return new ResultData(creditNum); | return new ResultData(creditNum); | ||||
| } | } | ||||