From 6e92478d68dfe10721e7de639c307351ec5c759f Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 18 Mar 2019 14:04:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/HomeController.java | 22 +++++++++++++++++-- .../controller/WxCouponController.java | 6 ++++- .../mq/impl/RabbitMqMessageProducer.java | 3 +++ .../mq/impl/RocketMqMessageProducer.java | 1 + .../service/impl/SendEmailServiceImpl.java | 2 +- .../service/impl/WxMsgRecordServiceImpl.java | 2 +- 6 files changed, 31 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index b6526d4ea..7cfcb683d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -7,9 +7,9 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.MallUserInfoVo; -import com.iformall.enums.EnumMallUserStatus; -import com.iformall.enums.EnumMsgModel; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; +import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.shiro.UserSession; import com.iformall.shiro.UseriFormallToken; @@ -66,6 +66,24 @@ public class HomeController extends BaseController { @Autowired private WxMsgValidationcodeService wxMsgValidationcodeService; + @Autowired + private MqBaseProducer mqBaseProducer; + + @ApiOperation("发送邮件") + @GetMapping("test") + public ResultData test() throws Exception { + String msg = "富茂审批邮件审批通过通知编号123231232323的合同已经审批通过,请登录,长融后台跟进后续工作"; + MailMsg mailMsg = new MailMsg(); + mailMsg.setHtml(true); + mailMsg.setFrom("luozukai1988@126.com"); + mailMsg.setTo(new String[]{"luozukai@iformall.com"}); + mailMsg.setSubject("富茂测试邮件"); + mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); + mailMsg.setMsg(msg); + mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); + return new ResultData(); + } + @GetMapping("/captcha.jpg") public void captcha(HttpServletResponse response)throws ServletException, IOException { logger.debug("[" + getIpAddr() + "] HomeController::captcha"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index 515aba748..b7d374d5b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -2,8 +2,10 @@ package com.iformall.controller; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.domain.po.MailMsg; import com.iformall.domain.po.WxCoupon; import com.iformall.enums.*; +import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; @@ -14,7 +16,10 @@ import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.web.bind.annotation.*; + +import javax.mail.internet.MimeMessage; import java.text.SimpleDateFormat; import java.util.*; @@ -27,7 +32,6 @@ public class WxCouponController extends BaseController { @Autowired private WxCouponService wxCouponService; - @ApiOperation("分页列表接口") @GetMapping("listCoupon") @ApiImplicitParams({ diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java index 948134008..5dddd82bd 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; +import java.util.UUID; + /** * @Auther: Stormeye * @Date: 2019-01-31 @@ -34,6 +36,7 @@ public class RabbitMqMessageProducer implements MqBaseProducer { @Override public void sendMessage(BaseMsg data, String topic, String tags, String keys) { try { + data.setUuid(UUID.randomUUID().toString()); wxMsgRecordService.save(data); rabbitTemplate.convertAndSend(topic, JsonUtil.obj2Json(data)); diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java index 13db5f4f4..63e328acb 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RocketMqMessageProducer.java @@ -59,6 +59,7 @@ public class RocketMqMessageProducer implements MqBaseProducer { @Override public void sendMessage(BaseMsg data, String topic, String tags, String keys) { try { + data.setUuid(UUID.randomUUID().toString()); wxMsgRecordService.save(data); byte[] messageBody = JsonUtil.obj2Json(data).getBytes(RemotingHelper.DEFAULT_CHARSET); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java index 947972d19..940bf533a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/SendEmailServiceImpl.java @@ -35,7 +35,7 @@ public class SendEmailServiceImpl implements MsgSendService { public void send(BaseMsg baseMsg) throws Exception{ MailMsg mailMsg = (MailMsg)baseMsg; - if(mailMsg.isHtml()){ + if(mailMsg.isHtml()){ //html邮件 MimeMessage message = sender.createMimeMessage(); MimeMessageHelper helper = new MimeMessageHelper(message, true); helper.setFrom(from); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index 72e3f21e1..d5860967a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -29,7 +29,7 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { } msgRecord.setMsgType(data.getMsgType()); - msgRecord.setUuid(UUID.randomUUID().toString()); + msgRecord.setUuid(data.getUuid()); msgRecord.setMsgJson(JsonUtil.obj2Json(data)); msgRecord.setId(idWorker.nextId()); wxMsgRecordMapper.save(msgRecord); From 2ef79ab2d432292d9046825d61d935aa7b0a8c62 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 18 Mar 2019 15:30:38 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[BUG][ID1001133][C=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8B=BC=E5=9B=A2=E5=90=8E=EF=BC=8C=E5=9B=A2?= =?UTF-8?q?=E6=BB=A1=EF=BC=8C=E4=B9=8B=E5=89=8D=E5=BE=85=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=9A=84=E5=B0=B1=E4=B8=8D=E8=AE=A9=E8=BF=9B=E8=A1=8C=E6=94=AF?= =?UTF-8?q?=E4=BB=98=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=9B=A2=E6=BB=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/common/ErrorCode.java | 2 +- .../java/com/iformall/service/impl/WxPayOrderServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 5fced5c4d..e7b3ff0e6 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -374,7 +374,7 @@ public enum ErrorCode{ * 拼团 */ ORDER_GROUP_COOPERATING_FAILD(28001, "参团失败"), - + ORDER_GROUP_COOPERATING_FINISHED(28002, "拼团人数已满"), ; private int code; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 03d557205..301ad821e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -121,6 +121,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); } + if (!order.getOrderGroupId().equals(0L) && + order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { + throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); + } if(order.getPressEndDate() == null) { // 非砍价券 if (order.getOrderStatus() == EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()) { From d15f5dbe360e4820290e84464402defd4fea410e Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 18 Mar 2019 15:46:05 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/HomeController.java | 30 ++++++++++--------- .../java/com/iformall/domain/po/WxCoupon.java | 11 +++++++ .../main/resources/mapper/WxCouponMapper.xml | 7 +++++ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java index 7cfcb683d..6108d635f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java @@ -69,20 +69,22 @@ public class HomeController extends BaseController { @Autowired private MqBaseProducer mqBaseProducer; - @ApiOperation("发送邮件") - @GetMapping("test") - public ResultData test() throws Exception { - String msg = "富茂审批邮件审批通过通知编号123231232323的合同已经审批通过,请登录,长融后台跟进后续工作"; - MailMsg mailMsg = new MailMsg(); - mailMsg.setHtml(true); - mailMsg.setFrom("luozukai1988@126.com"); - mailMsg.setTo(new String[]{"luozukai@iformall.com"}); - mailMsg.setSubject("富茂测试邮件"); - mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setMsg(msg); - mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); - return new ResultData(); - } +// @ApiOperation("发送邮件") +// @GetMapping("test") +// public ResultData test() throws Exception { +// String msg = "富茂审批邮件\n" + +// "
\n" + +// "
审批通过通知
编号123231232323的合同已经审批通过,请登录,长融后台跟进后续工作
"; +// MailMsg mailMsg = new MailMsg(); +// mailMsg.setHtml(true); +// mailMsg.setFrom("luozukai1988@126.com"); +// mailMsg.setTo(new String[]{"luozukai@iformall.com"}); +// mailMsg.setSubject("富茂测试邮件"); +// mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); +// mailMsg.setMsg(msg); +// mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); +// return new ResultData(); +// } @GetMapping("/captcha.jpg") public void captcha(HttpServletResponse response)throws ServletException, IOException { diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index d9cb09b63..2ed6b9bf5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -19,6 +19,9 @@ public class WxCoupon implements Serializable { @Transient protected List ids; + + @Transient + protected List notinTypes; @Transient protected String sortColumns; @@ -662,4 +665,12 @@ public class WxCoupon implements Serializable { public void setXtime(String xtime) { this.xtime = xtime; } + + public List getNotinTypes() { + return notinTypes; + } + + public void setNotinTypes(List notinTypes) { + this.notinTypes = notinTypes; + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 6e76a1fef..cba7d3ab6 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -183,6 +183,13 @@ #{idItem} + + and type not in + + #{typeItem} + + + order by ${sortColumns} From 54b26e44edbe023c23accd59b817cc248e848f63 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 18 Mar 2019 17:04:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxCouponOrderBVo.java | 12 ++++++++++++ .../main/resources/mapper/WxCouponOrderMapper.xml | 3 +++ 2 files changed, 15 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 98501cca5..7ef6d87de 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -117,6 +117,18 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Transient private Date endDate; + @Transient + private Long couponId; + + @Override + public Long getCouponId() { + return couponId; + } + + @Override + public void setCouponId(Long couponId) { + this.couponId = couponId; + } public Date getStartDate() { return startDate; diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 50609e595..de03b1fb9 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -358,6 +358,9 @@ and co.id = #{id} + + and c.id = #{couponId} + order by ${sortColumns} From a2af243fb822f689efcf48b16e9bbf59e38d8cee Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 18 Mar 2019 17:12:03 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[BUG][ID1001133][C=E7=AB=AF=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8B=BC=E5=9B=A2=E5=90=8E=EF=BC=8C=E5=9B=A2?= =?UTF-8?q?=E6=BB=A1=EF=BC=8C=E4=B9=8B=E5=89=8D=E5=BE=85=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E7=9A=84=E5=B0=B1=E4=B8=8D=E8=AE=A9=E8=BF=9B=E8=A1=8C=E6=94=AF?= =?UTF-8?q?=E4=BB=98=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=9B=A2=E6=BB=A1]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxPayOrderController.java | 4 ---- .../com/iformall/service/impl/WxOrderServiceImpl.java | 11 ++++++++++- .../iformall/service/impl/WxPayOrderServiceImpl.java | 9 +++++++++ .../src/main/resources/mapper/WxOrderMapper.xml | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index c81982470..f20fafb6b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -12,7 +12,6 @@ import com.iformall.domain.po.WxPayOrder; import com.iformall.enums.EnumPayStatus; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; -import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderService; import com.iformall.service.WxPayOrderService; import com.iformall.utils.IPUtil; @@ -44,9 +43,6 @@ public class WxPayOrderController extends BaseController { @Autowired private WxOrderService wxOrderService; - @Autowired - private WxCouponService wxCouponService; - @ApiOperation(value = "发起微信小程序支付订单", notes = "{\"orderId\":\"string\"}") @RequestMapping(value = "/create", method = RequestMethod.POST) public ResultData _create(@RequestBody Map paramMap, HttpServletRequest request) throws Exception { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 2e1014317..182a7c894 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -99,6 +99,9 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxOrderPressMapper wxOrderPressMapper; + @Autowired + WxOrderGroupMapper wxOrderGroupMapper; + @Override public PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); @@ -354,7 +357,13 @@ public class WxOrderServiceImpl implements WxOrderService { logger.error("商户不存在, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - + if (!orderGroupId.equals(0L)) { + WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId); + if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { + logger.error("下订单拼团人数已满>>>" + orderGroupId); + throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); + } + } // 减库存操作 stockReduce(user, coupon, couponIdStr); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 301ad821e..2f63f8604 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -123,8 +123,17 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { } if (!order.getOrderGroupId().equals(0L) && order.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) { + logger.error("支付时拼团已满>>" + order.getOrderGroupId()); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED); } + + WxCoupon wxCoupon = wxCouponMapper.selectByPrimaryKey(order.getProductId()); + if (wxCoupon.getType().equals(EnumCouponType.COUPON_GROUP.getCode()) && + wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode())) { + logger.error("券已经下架了>>>" + order.getProductId()); + throw new MallinkException(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF); + } + if(order.getPressEndDate() == null) { // 非砍价券 if (order.getOrderStatus() == EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()) { diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 4be9f1a72..f300c71d3 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -233,7 +233,7 @@ from wx_coupon c,wx_order o left join wx_coupon_order co on co.order_id = o.id left join wx_coupon_action_log cal on cal.coupon_order_id = co.id - where o.product_id = c.id + where o.product_id = c.id and c.type!=9 and o.c_user_id = #{cUserId} From 696cbfee96717453d7db0a22767056d4886d69de Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 18 Mar 2019 17:17:18 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxRentContractServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 0536cecf0..dde99c724 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -313,7 +313,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("id:{},启动审批流成功 ,是否补录:{}",record.getId().toString(),record.getMerchantId() != null); } - + // 保存调整金额(预账单调整) + if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){ + for (WxBillRent wxBillRent:record.getPreviewBillRentList()) { + wxBillRentMapper.update(wxBillRent); + } + } WxRentContract wxRentContract = (WxRentContract)resultData.data; wxRentContract.setPreviewBillRentList(resultList); return new ResultData(wxRentContract);