From 8390460427fc8a4f74aed1964433a6f770e4afc8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 11:30:38 +0800 Subject: [PATCH 01/13] Merge commit 'b4f929877e4882aca30f1338db2c87c1b7c524ce' into release # Conflicts: # mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java --- .../service/impl/WxBillAllServiceImpl.java | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index a364c2441..6667b1fb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -253,21 +253,27 @@ public class WxBillAllServiceImpl implements WxBillAllService { updateBillOtherDeposit(bill); } } else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { - logger.info("更新结算单id:{}",(Long)bill.get("id")); - WxBillSettleRecord settleRecord = new WxBillSettleRecord(); - settleRecord.setSettleId((Long)bill.get("id")); - settleRecord.setSettleMoney((Long) bill.get("owe")); - settleRecord.setSettleTime(new Date()); - settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); - - BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); - settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); - wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); - - WxBillSettle wxBillSettle = new WxBillSettle(); - wxBillSettle.setId(settleRecord.getSettleId()); - wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); - wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); + try { + logger.info("更新结算单id:{}",(Long)bill.get("id")); + WxBillSettleRecord settleRecord = new WxBillSettleRecord(); + settleRecord.setSettleId((Long)bill.get("id")); + settleRecord.setSettleMoney((Long) bill.get("owe")); + settleRecord.setSettleTime(new Date()); + settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); + + BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); + wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); + + WxBillSettle wxBillSettle = new WxBillSettle(); + wxBillSettle.setId(settleRecord.getSettleId()); + wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); + wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); + }catch (Exception e){ + logger.error("结算单error",e); + e.printStackTrace(); + } + }else{ logger.info("账单类型不存在"); } From cb4c0d121fee6f67c3d8723fda8acaa29482eda6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 11:48:40 +0800 Subject: [PATCH 02/13] Merge commit 'b4f929877e4882aca30f1338db2c87c1b7c524ce' into release # Conflicts: # mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java --- .../iformall/service/impl/WxBillSettleRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java index ab06c0019..1402be3f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java @@ -44,13 +44,13 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService record.setId(idWorker.nextId()); //清算完成 - if(record.getSettleMoney().intValue() == abs(record.getBalance().intValue())){ + if(record.getSettleMoney()!= null && record.getBalance()!=null && record.getSettleMoney().intValue() == abs(record.getBalance().intValue())){ WxBillSettle wxBillSettle = new WxBillSettle(); wxBillSettle.setId(record.getSettleId()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); } - if(record.getBalance() < 0){ + if(record.getBalance()!=null && record.getBalance() < 0){ record.setSettleMoney(-record.getSettleMoney()); } From c1deec46a98f187f767ad04931fff0ced15ec418 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 11:57:29 +0800 Subject: [PATCH 03/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 6667b1fb2..971acea5e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -255,6 +255,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { } else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { try { logger.info("更新结算单id:{}",(Long)bill.get("id")); + logger.info("更新结算单id.money:{}",(Long) bill.get("owe")); WxBillSettleRecord settleRecord = new WxBillSettleRecord(); settleRecord.setSettleId((Long)bill.get("id")); settleRecord.setSettleMoney((Long) bill.get("owe")); From 5e9479ac51c708c8d073f45032ad6f02d19b2d4b Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 12:20:28 +0800 Subject: [PATCH 04/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxBillAllServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 971acea5e..3027b0711 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -255,19 +255,19 @@ public class WxBillAllServiceImpl implements WxBillAllService { } else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { try { logger.info("更新结算单id:{}",(Long)bill.get("id")); - logger.info("更新结算单id.money:{}",(Long) bill.get("owe")); + WxBillSettle wxBillSettle = wxBillSettleService.getById((Long)bill.get("id")); + WxBillSettleRecord settleRecord = new WxBillSettleRecord(); settleRecord.setSettleId((Long)bill.get("id")); - settleRecord.setSettleMoney((Long) bill.get("owe")); + settleRecord.setSettleMoney(wxBillSettle.getBalance()); settleRecord.setSettleTime(new Date()); settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); + settleRecord.setTenantId(wxBillSettle.getTenantId()); BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); - WxBillSettle wxBillSettle = new WxBillSettle(); - wxBillSettle.setId(settleRecord.getSettleId()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); }catch (Exception e){ From 5d246c0ce8b048ea530d3883a78b24f2eedd0c76 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 12:46:25 +0800 Subject: [PATCH 05/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/test/Test.java | 37 ++++++++++++++++--- .../service/impl/WxBillAllServiceImpl.java | 3 ++ .../impl/WxBillSettleRecordServiceImpl.java | 3 +- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java index 9d8139178..6f66d1274 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -3,6 +3,9 @@ package com.iformall.service.test; import com.alibaba.fastjson.JSON; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxBillAll; +import com.iformall.enums.EnumSettleRecordWay; +import com.iformall.enums.EnumSettleStatus; +import com.iformall.mapper.WxBillSettleMapper; import com.iformall.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; @@ -27,6 +30,8 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Date; @Slf4j @AutoConfigureMockMvc @@ -61,6 +66,10 @@ public class Test { private WxBillSettleService wxBillSettleService; @Autowired private WxBillAllService wxBillAllService; + @Autowired + private WxBillSettleMapper wxBillSettleMapper; + @Autowired + private WxBillSettleRecordService wxBillSettleRecordService; @Before public void setUp() { @@ -87,11 +96,29 @@ public class Test { public void levelList() { // WxBillSettle settle = wxBillSettleService.getById(328411851323572224l); // log.debug("data:{}", JSON.toJSONString(settle)); - WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setMerchantId(324754110547066880l); - wxBillAll.setTenantId("456"); - wxBillAll.setBillTypeValue(10); - log.debug("data:{}", JSON.toJSONString( wxBillAllService.listBill(wxBillAll))); +// WxBillAll wxBillAll = new WxBillAll(); +// wxBillAll.setMerchantId(324754110547066880l); +// wxBillAll.setTenantId("456"); +// wxBillAll.setBillTypeValue(10); +// log.debug("data:{}", JSON.toJSONString( wxBillAllService.listBill(wxBillAll))); + + WxBillSettle wxBillSettle = wxBillSettleService.getById(330875180045271040l); + + + WxBillSettleRecord settleRecord = new WxBillSettleRecord(); + settleRecord.setSettleId(wxBillSettle.getId()); + settleRecord.setSettleMoney(wxBillSettle.getBalance()); + settleRecord.setSettleTime(new Date()); + settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); + settleRecord.setTenantId(wxBillSettle.getTenantId()); + + BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); + settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); + wxBillSettleRecordService.saveOrUpdate(settleRecord,null,wxBillSettle.getId()); + + wxBillSettle.setUpdatetime(new Date()); + wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); + wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 3027b0711..797ce3978 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -268,8 +268,11 @@ public class WxBillAllServiceImpl implements WxBillAllService { settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); wxBillSettleRecordService.saveOrUpdate(settleRecord,null,(Long)bill.get("userId")); + wxBillSettle.setUpdatetime(new Date()); wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); + + logger.info("更新结算单success"); }catch (Exception e){ logger.error("结算单error",e); e.printStackTrace(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java index 1402be3f6..78c924715 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java @@ -61,7 +61,8 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService record.setUserName(mallUserInfo.getName()); }else if(bUserId != null){ WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); - record.setUserName(wxMerchantBUser.getName()); + if(wxMerchantBUser!=null) + record.setUserName(wxMerchantBUser.getName()); } wxBillSettleRecordMapper.insertSelective(record); }else{ From c218ab605bf72ecc89a037c8f2a36864c2794774 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 12:47:14 +0800 Subject: [PATCH 06/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E7=BB=93=E7=AE=97=E5=8D=95?= =?UTF-8?q?=E5=9B=9E=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxBillAllServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 797ce3978..69f23e55b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -16,6 +16,7 @@ import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.utils.DateUtils; +import com.iformall.utils.JsonUtil; import com.iformall.utils.PriceUtil; import com.iformall.utils.WordUtil; import org.apache.commons.collections.CollectionUtils; @@ -254,7 +255,8 @@ public class WxBillAllServiceImpl implements WxBillAllService { } } else if (billTypeValue == EnumBillTypeParam.SETTLE.getCode().intValue()) { try { - logger.info("更新结算单id:{}",(Long)bill.get("id")); + logger.info("更新结算单id:{}", JsonUtil.obj2Json(bill)); + WxBillSettle wxBillSettle = wxBillSettleService.getById((Long)bill.get("id")); WxBillSettleRecord settleRecord = new WxBillSettleRecord(); From 7e4125401703a63cc9f2e2ca548a667395454e08 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 9 Sep 2019 13:59:21 +0800 Subject: [PATCH 07/13] =?UTF-8?q?[=E8=B0=83=E6=95=B4]=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCouponSendController.java | 5 +++++ .../controller/WxCouponSendController.java | 20 +++++++++++++------ .../java/com/iformall/common/ErrorCode.java | 1 + .../service/impl/WxCouponSendServiceImpl.java | 4 +++- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 8e75ec650..0258e6cfd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -15,6 +15,7 @@ import com.iformall.enums.EnumCouponSendSendType; import com.iformall.enums.EnumCouponSendStatus; import com.iformall.enums.EnumCouponSendType; import com.iformall.enums.EnumCouponStatus; +import com.iformall.exception.MallinkException; import com.iformall.service.WxCouponActionLogService; import com.iformall.service.WxCouponSendService; import com.iformall.service.WxCouponService; @@ -145,7 +146,11 @@ public class WxCouponSendController extends BaseController { if (wxCouponSend == null) { return new ResultData(ErrorCode.COUPON_SEND_IS_INVALID); } + try { wxCouponSendService.updateInvalid(wxCouponSend); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(),e.getMessage()) ; + } return new ResultData(); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java index 74c9ccd94..6a3b84e9c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java @@ -49,7 +49,7 @@ public class WxCouponSendController extends BaseController { public ResultData list(WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::list"); if (Objects.isNull(wxCouponSend.getSendType())) { - throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setMerchantId(getUser().getMerchantId()); @@ -78,20 +78,20 @@ public class WxCouponSendController extends BaseController { public ResultData handSel(@RequestBody Map params) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::handSel"); if (CollectionUtils.isEmpty(params)) { - throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } WxCUser cu = wxCUserMapper.selectByPrimaryKey(params.get("cUserId")); if (Objects.isNull(cu)) { - throw new MallinkException(ErrorCode.USER_IS_EMPTY); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } if (!params.containsKey("wxCouponSendIds")) { - throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); + return new ResultData(ErrorCode.COUPON_IS_EMPTY); } List wxCouponSendIds = (List) params.get("wxCouponSendIds"); if (CollectionUtils.isEmpty(wxCouponSendIds)) { - throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); + return new ResultData(ErrorCode.COUPON_IS_EMPTY); } WxCouponSend wxCouponSend = new WxCouponSend(); @@ -99,7 +99,15 @@ public class WxCouponSendController extends BaseController { wxCouponSend.setTenantId(getTenantId()); wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode()); - wxCouponSendService.handSel(wxCouponSend, cu); + try { + wxCouponSendService.handSel(wxCouponSend, cu); + } catch (MallinkException e) { + logger.error("注异常: " + e.getMessage()); + return new ResultData(e.getErrorCode(), e.getMessage()); + } catch (Exception e) { + logger.error("注异常: " + e.getMessage()); + return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage()); + } return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 75ddd0c35..74272cbfc 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -193,6 +193,7 @@ public enum ErrorCode{ COUPON_ORDER_IS_LATER_THAN_VALIDDATE(4007, "卡券使用期已结束"), COUPON_ORDER_IS_PRE_VERIFY(4008, "卡券已被预核销"), COUPON_SEND_LIMIT_VERIFY(4009, "商户购券数错误"), + COUPON_HANDSEL_VERIFY(4010, "商户发券异常"), /** * 卡 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index cae8e1f06..ae3a407e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -607,9 +607,11 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { couponSendList.forEach(cs -> { // 发放免费券 WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(user.getId(), cs.getCouponId(), cs); - wxCouponActionLogService.addOne(user.getTenantId(), cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); if (couponOrder != null) { + wxCouponActionLogService.addOne(user.getTenantId(), cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId()); sendMsgForSendCoupon(cs.getTenantId(), cs, couponOrder, user); + } else { + logger.warn("handSel couponOrder is null"); } }); } From 349320889b163011cab7d89e891ad4c718b975d4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 9 Sep 2019 14:25:55 +0800 Subject: [PATCH 08/13] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/WxBillAllMapper.xml | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 610e59eb9..3a05f32b3 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -732,14 +732,10 @@ order by totalOwe desc -