From f4439e5c8bdb556fd0c204c11bf8e1634506a022 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 12 Sep 2019 20:20:45 +0800 Subject: [PATCH 01/24] =?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]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/OrderExpiringSchedule.java | 59 +++++++++++++++++-- .../mq/impl/RabbitMqMessageProducer.java | 8 +-- 2 files changed, 57 insertions(+), 10 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index b362e5a7d..230872b9e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -2,17 +2,18 @@ package com.iformall.schedule; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxOrder; -import com.iformall.enums.EnumAppType; -import com.iformall.enums.EnumOrderStatus; -import com.iformall.enums.EnumOrderType; -import com.iformall.enums.EnumRefundStatus; +import com.iformall.domain.po.msg.*; +import com.iformall.enums.*; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxOrderGroupMapper; import com.iformall.mapper.WxOrderMapper; +import com.iformall.mq.MqBaseProducer; +import com.iformall.service.WxMsgRecordService; import com.iformall.service.WxOrderGroupService; import com.iformall.service.WxOrderService; import com.iformall.service.WxRefundOrderService; +import com.iformall.utils.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +55,12 @@ public class OrderExpiringSchedule { @Autowired WxCouponMapper wxCouponMapper; + @Autowired + WxMsgRecordService wxMsgRecordService; + + @Autowired + MqBaseProducer mqBaseProducer; + @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void orderExpireSchedule() { @@ -143,7 +150,49 @@ public class OrderExpiringSchedule { } }); - + //消息重发 + WxMsgRecord msgRecord = new WxMsgRecord(); + msgRecord.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); + List recordList = wxMsgRecordService.findList(msgRecord); + for (WxMsgRecord wxMsgRecord:recordList) { + logger.info("消息重发:{}",wxMsgRecord.getMsgJson()); + try { + if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ + //内部消息 - 下订单成功 + FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_C_LOGIN.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideCLoginMsg msg = (FmInsideCLoginMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCLoginMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideNotifyPaySuccessMsg msg = (FmInsideNotifyPaySuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyPaySuccessMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyRefundSuccessMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } + } catch (Exception e) { + logger.error("消息重发错误:" + e.getMessage()); + } + } } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) 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 f248ec48c..1123a9547 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -46,17 +46,15 @@ public class RabbitMqMessageProducer implements MqBaseProducer , RabbitTemplate. @Override public void confirm(CorrelationData correlationData, boolean ack, String cause) { log.info("confirm:: correlationData {},ack {}, cause {}", correlationData,ack,cause); - System.out.println(); - if(ack){ - System.out.println(); - }else{ + if(!ack){ BaseMsg data = new BaseMsg(); + data.setUuid(correlationData.getId()); data.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); + data.setStatusMessage(cause); wxMsgRecordMapper.update(data); } } - @Override public void returnedMessage(Message message, int replyCode, String replyText, String exchange, String routingKey) { log.info("returnedMessage::message {} 消息发送失败,应答码:{}, 应答描述:{} ,exchange: {} ,routingKey :{}", new String(message.getBody()), replyCode, replyText, exchange, routingKey); From 358c05b8352f711b1df73a87ada0c2efc43c25e6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 13 Sep 2019 13:34:02 +0800 Subject: [PATCH 02/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E9=87=8D?= =?UTF-8?q?=E5=8F=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/mq/MqBaseConsumer.java | 1 - .../iformall/schedule/MsgReSendSchedule.java | 77 +++++++++++++++++++ .../schedule/OrderExpiringSchedule.java | 55 ------------- 3 files changed, 77 insertions(+), 56 deletions(-) create mode 100644 mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index d9a0b3ff3..253a2a270 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -5,7 +5,6 @@ import com.iformall.enums.*; import com.iformall.mapper.WxMsgRecordMapper; import com.iformall.service.msg.impl.*; import com.iformall.utils.JsonUtil; -import org.checkerframework.checker.units.qual.A; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java new file mode 100644 index 000000000..ac009a214 --- /dev/null +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -0,0 +1,77 @@ +package com.iformall.schedule; + +import com.iformall.domain.po.msg.*; +import com.iformall.enums.*; +import com.iformall.mq.MqBaseProducer; +import com.iformall.service.WxMsgRecordService; +import com.iformall.utils.JsonUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import java.util.List; + +/** + * 消息重发 + */ +@Component +public class MsgReSendSchedule { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxMsgRecordService wxMsgRecordService; + @Autowired + private MqBaseProducer mqBaseProducer; + + @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 + //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 + public void msgReSend() { + //消息重发 + WxMsgRecord msgRecord = new WxMsgRecord(); + msgRecord.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); + List recordList = wxMsgRecordService.findList(msgRecord); + for (WxMsgRecord wxMsgRecord:recordList) { + logger.info("消息重发:{}",wxMsgRecord.getMsgJson()); + try { + if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ + //内部消息 - 下订单成功 + FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_C_LOGIN.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideCLoginMsg msg = (FmInsideCLoginMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCLoginMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideNotifyPaySuccessMsg msg = (FmInsideNotifyPaySuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyPaySuccessMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ + FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyRefundSuccessMsg.class); + msg.setMsgType(wxMsgRecord.getMsgType()); + msg.setReceiver(wxMsgRecord.getReceiver()); + msg.setTenantId(wxMsgRecord.getTenantId()); + mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } + } catch (Exception e) { + logger.error("消息重发错误:" + e.getMessage()); + } + } + + } + + +} \ No newline at end of file diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java index 230872b9e..6af580675 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/OrderExpiringSchedule.java @@ -2,7 +2,6 @@ package com.iformall.schedule; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxOrder; -import com.iformall.domain.po.msg.*; import com.iformall.enums.*; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxCouponMapper; @@ -13,7 +12,6 @@ import com.iformall.service.WxMsgRecordService; import com.iformall.service.WxOrderGroupService; import com.iformall.service.WxOrderService; import com.iformall.service.WxRefundOrderService; -import com.iformall.utils.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -21,7 +19,6 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - import java.util.Date; import java.util.HashMap; import java.util.List; @@ -43,9 +40,6 @@ public class OrderExpiringSchedule { @Autowired WxOrderGroupMapper wxOrderGroupMapper; - @Autowired - WxOrderGroupService wxOrderGroupService; - @Autowired WxAppinfoMapper wxAppinfoMapper; @@ -55,12 +49,6 @@ public class OrderExpiringSchedule { @Autowired WxCouponMapper wxCouponMapper; - @Autowired - WxMsgRecordService wxMsgRecordService; - - @Autowired - MqBaseProducer mqBaseProducer; - @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void orderExpireSchedule() { @@ -150,49 +138,6 @@ public class OrderExpiringSchedule { } }); - //消息重发 - WxMsgRecord msgRecord = new WxMsgRecord(); - msgRecord.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); - List recordList = wxMsgRecordService.findList(msgRecord); - for (WxMsgRecord wxMsgRecord:recordList) { - logger.info("消息重发:{}",wxMsgRecord.getMsgJson()); - try { - if(EnumMsgRecordType.INSIDE_ORDER_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ - //内部消息 - 下订单成功 - FmInsideOrderSuccessMsg msg = (FmInsideOrderSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideOrderSuccessMsg.class); - msg.setMsgType(wxMsgRecord.getMsgType()); - msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); - mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - }else if(EnumMsgRecordType.INSIDE_COUPON_VERIFY.getCode().equals(wxMsgRecord.getMsgType())){ - FmInsideCouponVerifyMsg msg = (FmInsideCouponVerifyMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCouponVerifyMsg.class); - msg.setMsgType(wxMsgRecord.getMsgType()); - msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); - mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - }else if(EnumMsgRecordType.INSIDE_C_LOGIN.getCode().equals(wxMsgRecord.getMsgType())){ - FmInsideCLoginMsg msg = (FmInsideCLoginMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideCLoginMsg.class); - msg.setMsgType(wxMsgRecord.getMsgType()); - msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); - mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - }else if(EnumMsgRecordType.INSIDE_NOTIFY_PAY_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ - FmInsideNotifyPaySuccessMsg msg = (FmInsideNotifyPaySuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyPaySuccessMsg.class); - msg.setMsgType(wxMsgRecord.getMsgType()); - msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); - mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - }else if(EnumMsgRecordType.INSIDE_NOTIFY_REFUND_SUCCESS.getCode().equals(wxMsgRecord.getMsgType())){ - FmInsideNotifyRefundSuccessMsg msg = (FmInsideNotifyRefundSuccessMsg) JsonUtil.readValue(wxMsgRecord.getMsgJson(),FmInsideNotifyRefundSuccessMsg.class); - msg.setMsgType(wxMsgRecord.getMsgType()); - msg.setReceiver(wxMsgRecord.getReceiver()); - msg.setTenantId(wxMsgRecord.getTenantId()); - mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); - } - } catch (Exception e) { - logger.error("消息重发错误:" + e.getMessage()); - } - } } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) From 2ea03a5e49b1d8023163df7e92ebbca1f56f7566 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 10:48:21 +0800 Subject: [PATCH 03/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E5=A4=87=E6=B3=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/iformall/service/test/Test.java | 9 ++++----- .../java/com/iformall/schedule/MsgReSendSchedule.java | 4 ++-- .../service/impl/WxBillSettleRecordServiceImpl.java | 7 ++++++- 3 files changed, 12 insertions(+), 8 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 aba63e9f2..95a7cde0a 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -66,10 +66,12 @@ public class Test { private MockMvc mockMvc; - @Autowired MqBaseProducer mqBaseProducer; + @Autowired + MsgReSendSchedu + @Autowired private WxBillSettleService wxBillSettleService; @@ -148,10 +150,7 @@ public class Test { @org.junit.Test public void testmq2(){ - WxBillAll wxBillAll = new WxBillAll(); - wxBillAll.setTenantId("456"); - wxBillAll.setMerchantId(324754110547066880l); - System.out.println("--------"+JsonUtil.obj2Json(wxBillAllService.listBill(wxBillAll))); + MsgReSendSchedule. } @org.junit.Test diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java index ac009a214..73cad0f16 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -24,8 +24,8 @@ public class MsgReSendSchedule { @Autowired private MqBaseProducer mqBaseProducer; - @Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 - //@Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 + //@Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 + @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void msgReSend() { //消息重发 WxMsgRecord msgRecord = new WxMsgRecord(); 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 78c924715..e307eac5b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java @@ -54,7 +54,12 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService record.setSettleMoney(-record.getSettleMoney()); } - String str = EnumSettleRecordWay.getEnum(record.getSettleWay()).getMessage()+"收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; + String str; + if(EnumSettleRecordWay.OTHER.getCode().equals(record.getSettleWay())){ + str = EnumSettleRecordWay.getEnum(record.getRemark()+"-收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; + }else{ + str = EnumSettleRecordWay.getEnum(record.getSettleWay()).getMessage()+"收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; + } record.setDetail(str); if(mallUserInfo != null) { record.setUserid(mallUserInfo.getId()); From f9e09f555d099210a1ecccbbf1cef59051fcfb4c Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 10:50:30 +0800 Subject: [PATCH 04/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E5=A4=87=E6=B3=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxBillSettleRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e307eac5b..8af5bdc45 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleRecordServiceImpl.java @@ -56,7 +56,7 @@ public class WxBillSettleRecordServiceImpl implements WxBillSettleRecordService String str; if(EnumSettleRecordWay.OTHER.getCode().equals(record.getSettleWay())){ - str = EnumSettleRecordWay.getEnum(record.getRemark()+"-收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; + str = record.getRemark()+"-收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; }else{ str = EnumSettleRecordWay.getEnum(record.getSettleWay()).getMessage()+"收款"+new BigDecimal(record.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP)+"元"; } From 838d88d1878ba2a6e286df4b618e8bcd1658e4f6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 10:51:45 +0800 Subject: [PATCH 05/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E5=A4=87=E6=B3=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/iformall/service/test/Test.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 95a7cde0a..52b7af14f 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -69,8 +69,8 @@ public class Test { @Autowired MqBaseProducer mqBaseProducer; - @Autowired - MsgReSendSchedu +// @Autowired +// MsgReSendSchedu @Autowired From 9ff8fbbab7400c8f3e6703323d470476b50d85cd Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 10:52:17 +0800 Subject: [PATCH 06/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E5=A4=87=E6=B3=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/test/java/com/iformall/service/test/Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 52b7af14f..afc13dcdd 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -150,7 +150,7 @@ public class Test { @org.junit.Test public void testmq2(){ - MsgReSendSchedule. + } @org.junit.Test From 6d3fa2a2114baa52445a7dc92359e39c7ce5a5f7 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 11:03:52 +0800 Subject: [PATCH 07/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E5=A4=87=E6=B3=A8=E5=B1=95?= =?UTF-8?q?=E7=A4=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/test/java/com/iformall/service/test/Test.java | 4 ---- .../main/java/com/iformall/schedule/MsgReSendSchedule.java | 6 ++++-- 2 files changed, 4 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 afc13dcdd..396ebac38 100644 --- a/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java +++ b/mallinkAdmin/src/test/java/com/iformall/service/test/Test.java @@ -69,10 +69,6 @@ public class Test { @Autowired MqBaseProducer mqBaseProducer; -// @Autowired -// MsgReSendSchedu - - @Autowired private WxBillSettleService wxBillSettleService; @Autowired diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java index 73cad0f16..d9f968677 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgReSendSchedule.java @@ -24,9 +24,10 @@ public class MsgReSendSchedule { @Autowired private MqBaseProducer mqBaseProducer; - //@Scheduled(cron = "0 */5 * * * *?") // 每5分钟检查一次 + //@Scheduled(cron = "0 */1 * * * *?") // 每5分钟检查一次 @Scheduled(cron = "*/10 * * * * ?") // 测试10秒中一次 public void msgReSend() { + logger.info("消息重发开始..."); //消息重发 WxMsgRecord msgRecord = new WxMsgRecord(); msgRecord.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); @@ -67,10 +68,11 @@ public class MsgReSendSchedule { mqBaseProducer.sendMessage(msg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } } catch (Exception e) { + e.printStackTrace(); logger.error("消息重发错误:" + e.getMessage()); } } - + logger.info("消息重发结束..."); } From 171bc62edf4fa8db25201f363e5c173dd84dc2bf Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 11:12:54 +0800 Subject: [PATCH 08/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=9B=9E?= =?UTF-8?q?=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/impl/RabbitMqMessageProducer.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) 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 1123a9547..70db1c762 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -47,11 +47,15 @@ public class RabbitMqMessageProducer implements MqBaseProducer , RabbitTemplate. public void confirm(CorrelationData correlationData, boolean ack, String cause) { log.info("confirm:: correlationData {},ack {}, cause {}", correlationData,ack,cause); if(!ack){ - BaseMsg data = new BaseMsg(); - data.setUuid(correlationData.getId()); - data.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); - data.setStatusMessage(cause); - wxMsgRecordMapper.update(data); + try { + BaseMsg data = new BaseMsg(); + data.setUuid(correlationData.getId()); + data.setMsgStatus(EnumMsgRecordStatus.SEND_FAIL.getCode()); + data.setStatusMessage(cause); + wxMsgRecordMapper.update(data); + } catch (Exception e) { + log.error(" RabbitMqMessageProducer.confirm.updateDb Error", e); + } } } @@ -62,18 +66,18 @@ public class RabbitMqMessageProducer implements MqBaseProducer , RabbitTemplate. @Override public void sendMessage(BaseMsg data, String topic, String tags, String keys) { - String tag = UUID.randomUUID().toString(); + String uuid = UUID.randomUUID().toString(); try { - data.setUuid(tag); + data.setUuid(uuid); wxMsgRecordService.save(data); - CorrelationData correlationData = new CorrelationData(tag); + CorrelationData correlationData = new CorrelationData(uuid); rabbitTemplate.convertAndSend(topic, (Object) JsonUtil.obj2Json(data),correlationData); // data.setMsgStatus(EnumMsgRecordStatus.SEND_SUCC.getCode()); // wxMsgRecordMapper.update(data); log.info(data.getUuid()+"发送mq成功。"); } catch (Exception e) { - log.error(tag + " RabbitMqMessageProducer: Send Message Error", e); + log.error(uuid + " RabbitMqMessageProducer: Send Message Error", e); } } } From e328292085f8eccf2f35595dba039f5d6172e98e Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 16 Sep 2019 13:09:53 +0800 Subject: [PATCH 09/24] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/enums/EnumMsgModel.java | 4 +- .../controller/sys/DataInitController.java | 86 +++++++++++++++++++ 2 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java index f679a6f7a..28d473235 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgModel.java @@ -32,8 +32,8 @@ public enum EnumMsgModel { FLOW_C_REJECT_NODIFY(22, "驳回通知"), //会员生日券 - COUPON_BIRTHDAY_OPENED(28, "会员生日券开启"), - COUPON_BIRTHDAY_OPENED_NO(29, "会员生日券未开启"), + COUPON_BIRTHDAY_OPENED(28, "会员生日券倍率开启"), + COUPON_BIRTHDAY_OPENED_NO(29, "会员生日券倍率未开启"), ; public static EnumMsgModel getEnum(Integer code) { diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java new file mode 100644 index 000000000..41d0558ff --- /dev/null +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java @@ -0,0 +1,86 @@ +package com.iformall.controller.sys; + +import com.iformall.common.ErrorCode; +import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMall; +import com.iformall.domain.po.WxMsgSignature; +import com.iformall.domain.po.WxMsgValidationcodeModel; +import com.iformall.enums.EnumMsgModel; +import com.iformall.mapper.WxMallMapper; +import com.iformall.mapper.WxMsgSignatureMapper; +import com.iformall.mapper.WxMsgValidationcodeModelMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 数据初始化 + */ +@Slf4j +@RestController +@RequestMapping("sys") +public class DataInitController { + + + @Resource + private WxMallMapper mallMapper; + @Resource + private WxMsgSignatureMapper signatureMapper; + @Resource + private WxMsgValidationcodeModelMapper modelMapper; + + @GetMapping("/init") + public ResultData init() { + + try { + addBirthDayMsgModel(); + } catch (Exception e) { + log.error("DataInitController::init error ", e); + return new ResultData(ErrorCode.MSG_METHOD_REQUEST_ERROR, e.getMessage()); + } + + return new ResultData(); + } + + /** + * 增加会员生日短信模板 + */ + @Transactional + public void addBirthDayMsgModel() { + List list = signatureMapper.selectAll(); + Map tenantOfSignature = list.stream().collect(Collectors.toMap(WxMsgSignature::getTenantId, WxMsgSignature::getName)); + + List malls = mallMapper.selectAll(); + IdWorker idWorker = IdWorker.get(); + malls.forEach(wxMall -> { + addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, EnumMsgModel.COUPON_BIRTHDAY_OPENED, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO, "会员生日券未开启', '富茂中心', '亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + }); + } + + private void addBirthDayMsgModelItem(Map tenantOfSignature, IdWorker idWorker, WxMall wxMall, EnumMsgModel msgModel, String content) { + WxMsgValidationcodeModel model = new WxMsgValidationcodeModel(); + model.setTenantId(wxMall.getTenantId()); + model.setId(idWorker.nextId()); + model.setType(msgModel.getCode()); + model.setName(msgModel.getMessage()); + model.setSignature(tenantOfSignature.get(wxMall.getTenantId())); + model.setContent(content); + model.setCreatetime(new Date()); + model.setStatus(0); + model.setMinutes(0); + model.setOpen(0); + model.setMsgType(1); + model.setRoleType(3); + modelMapper.insertSelective(model); + } +} From c4047b8d78bd2cff4fe19f92d6cfd51c8b448168 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 14:06:10 +0800 Subject: [PATCH 10/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=8D=95][=E4=BC=98=E5=8C=96=E6=B6=88=E6=81=AF=E5=9B=9E?= =?UTF-8?q?=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/enums/EnumMsgRecordStatus.java | 1 + .../service/impl/WxBillSettleServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java index 70898af84..677c00e08 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgRecordStatus.java @@ -1,5 +1,6 @@ package com.iformall.enums; + /** * Created by luozukai */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 2abf98bc6..48ad4eae4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -360,6 +360,24 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { } } wxBillOtherMapper.updateByPrimaryKeySelective(wxBillRent); + + WxBillPropertyDeposit propertyDeposit = new WxBillPropertyDeposit(); + propertyDeposit.setId(bill.getBillId()); + if(freezeStatus != null) propertyDeposit.setFreeze(freezeStatus); + if(status != null){ + propertyDeposit.setStatus(status); + propertyDeposit.setPayDate(new Date()); + } + if(EnumBillRentStatus.PAID.getCode().equals(status)){ + WxBillPropertyDeposit dbBill = wxBillPropertyDepositMapper.selectByPrimaryKey(wxBillRent.getId()); + if(dbBill!=null) { + propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); + propertyDeposit.setPayDate(new Date()); + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + addBillAction(bill.getBillId(), dbBill.getOwe()); + } + } + wxBillPropertyDepositMapper.updateByPrimaryKeySelective(propertyDeposit); } } } From b5fca840142bf70a6d2562d0ec5655821b38d515 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 16 Sep 2019 14:17:15 +0800 Subject: [PATCH 11/24] =?UTF-8?q?[=E8=B0=83=E6=95=B4]=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C=E5=92=8C=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCreditHistoryController.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 657976e2a..2dd8d0bea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Map; import java.util.Objects; @RestController @@ -57,7 +58,15 @@ public class WxCreditHistoryController extends BaseController { if(Objects.isNull(merchantId)|| StringUtils.isEmpty(spendStr)||Objects.isNull(userId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; } - return new ResultData(wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId,getTenantId())); + + try { + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId,getTenantId()) ; + return new ResultData(result); + } catch (MallinkException e) { + return new ResultData(e.getErrorCode(),e.getMessage()); + } catch (Exception e) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,e.getMessage()); + } } @ApiOperation("新增接口") From d95895772e1bb0bade3e2b36871e3dcf61e0415e Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 16 Sep 2019 14:17:39 +0800 Subject: [PATCH 12/24] =?UTF-8?q?[=E8=B0=83=E6=95=B4]=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/DataInitController.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java index 41d0558ff..cc1ce4e7e 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java @@ -40,7 +40,6 @@ public class DataInitController { @GetMapping("/init") public ResultData init() { - try { addBirthDayMsgModel(); } catch (Exception e) { @@ -54,16 +53,26 @@ public class DataInitController { /** * 增加会员生日短信模板 */ - @Transactional + @Transactional(rollbackFor = Exception.class) public void addBirthDayMsgModel() { List list = signatureMapper.selectAll(); Map tenantOfSignature = list.stream().collect(Collectors.toMap(WxMsgSignature::getTenantId, WxMsgSignature::getName)); + IdWorker idWorker = IdWorker.get(); + addBirthDayMsgModelToMall(tenantOfSignature, EnumMsgModel.COUPON_BIRTHDAY_OPENED, idWorker, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + addBirthDayMsgModelToMall(tenantOfSignature, EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO, idWorker, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + } + + private void addBirthDayMsgModelToMall(Map tenantOfSignature, EnumMsgModel type, IdWorker idWorker, String content) { + //查找已经添加过的接口列表 + WxMsgValidationcodeModel query = new WxMsgValidationcodeModel(); + query.setMsgType(1); + query.setType(type.getCode()); + List dbModelList = modelMapper.select(query); + Map dbModelMap = dbModelList.stream().collect(Collectors.toMap(WxMsgValidationcodeModel::getTenantId, WxMsgValidationcodeModel::getName)); List malls = mallMapper.selectAll(); - IdWorker idWorker = IdWorker.get(); - malls.forEach(wxMall -> { - addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, EnumMsgModel.COUPON_BIRTHDAY_OPENED, "亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); - addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, EnumMsgModel.COUPON_BIRTHDAY_OPENED_NO, "会员生日券未开启', '富茂中心', '亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!"); + malls.stream().filter(wxMall -> !dbModelMap.containsKey(wxMall.getTenantId())).forEach(wxMall -> { + addBirthDayMsgModelItem(tenantOfSignature, idWorker, wxMall, type, content); }); } @@ -76,7 +85,7 @@ public class DataInitController { model.setSignature(tenantOfSignature.get(wxMall.getTenantId())); model.setContent(content); model.setCreatetime(new Date()); - model.setStatus(0); + model.setStatus(1); model.setMinutes(0); model.setOpen(0); model.setMsgType(1); From e30b69cb8cc03bb1a75c37032fb5a9932ba506fd Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 16 Sep 2019 14:39:54 +0800 Subject: [PATCH 13/24] =?UTF-8?q?[=E5=95=86=E6=88=B7=E8=B4=A6=E5=8D=95][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=98=BE=E7=A4=BA=E7=BB=93=E4=BD=99?= =?UTF-8?q?=E9=87=91=E9=A2=9D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/WxBillAllMapper.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index ddee59f94..15092fdc6 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -731,7 +731,7 @@ select tt.* from ( select m.tenant_id,m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_phone linkPhone, xb.title business,rc.rental_start_date rentalStartDate,rc.rental_end_date rentalEndDate,rc.rent_shop_type, - round( + ifnull(round( (select sum(bill.receive_pay) from ( select merchant_id,receive_pay from wx_bill_rent where is_preview = 0 and status not in(3,6) union all @@ -747,8 +747,8 @@ union all select merchant_id,receive_pay from wx_bill_other_deposit where status not in(3,6) ) bill where bill.merchant_id = m.id - )/100,2) receivePay, - round( + )/100,2),0) receivePay, + ifnull(round( (select sum(ss.money) from ( select ms.subsidy money,mm.id from wx_merchant_subsidy ms @@ -765,9 +765,9 @@ union all select receive_pay money,merchant_id id from wx_bill_other_deposit where status = 3 )ss where ss.id = m.id - )/100,2) payOut, - - (round( + )/100,2),0) payOut, + + (ifnull(round( (select sum(bill.receive_pay) from ( select merchant_id,receive_pay from wx_bill_rent where is_preview = 0 and status not in(3,6) union all @@ -783,8 +783,8 @@ union all select merchant_id,receive_pay from wx_bill_other_deposit where status not in(3,6) ) bill where bill.merchant_id = m.id - )/100,2)- - round( + )/100,2),0)- + ifnull(round( (select sum(ss.money) from ( select ms.subsidy money,mm.id from wx_merchant_subsidy ms @@ -801,7 +801,7 @@ union all select receive_pay money,merchant_id id from wx_bill_other_deposit where status = 3 )ss where ss.id = m.id - )/100,2)) balance + )/100,2),0)) balance from wx_merchant m left join (select ms.merchant_id,s.type,GROUP_CONCAT(s.shop_number) as shop_number From 99869327d4d045e7ed446b81a2917856b8225ac6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 16 Sep 2019 15:38:00 +0800 Subject: [PATCH 14/24] =?UTF-8?q?[=E9=94=99=E8=AF=AF=E7=A0=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=80=BC=E9=87=8D=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/java/com/iformall/common/ErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 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 5013b693f..53b2703dc 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -236,7 +236,7 @@ public enum ErrorCode{ MP_TEMPLATE_SEND_FAILED(11009, "公众号模板消息发送失败"), UNIFORM_SEND_FAILED(11010, "小程序统一消息发送失败"), USER_LOGIN_FAILED(11011, "微信用户未登录或登录有问题"), - USER_NOT_AUTH_PHONE(11011, "用户小程序未授权手机号码"), + USER_NOT_AUTH_PHONE(11012, "用户小程序未授权手机号码"), /** * POS From f3edcc6c67a760fd36237b3e89d057c6abe02efe Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 16:18:50 +0800 Subject: [PATCH 15/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81][=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 6 ++++++ .../impl/WxRentContractServiceImpl.java | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index ffc3f5063..30e0f45ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -429,6 +429,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService logger.info("id:{},启动审批流成功,是否补录:{}", record.getRentContractId().toString(), record.getMerchantId() != null); } } + }else{ + //合同状态改为记租中 + WxRentContract updateRentContract = new WxRentContract(); + updateRentContract.setId(record.getRentContractId()); + updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); + wxRentContractMapper.updateStatus(updateRentContract); } return new ResultData(Result.SUCCESS, message, record); 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 34f50baca..51194402c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -510,6 +510,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxRentContractMapper.updateStatus(updateRentContract); logger.info("id:{},启动审批流成功, 是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } + }else{ + //合同状态改为记租中 + WxRentContract updateRentContract = new WxRentContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); + wxRentContractMapper.updateStatus(updateRentContract); } //生成预览账单(补录第二步,第三步走编辑) @@ -567,6 +573,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxRentContractMapper.updateStatus(updateRentContract); logger.info("id:{},启动审批流成功 ,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } + }else{ + //合同状态改为记租中 + WxRentContract updateRentContract = new WxRentContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); + wxRentContractMapper.updateStatus(updateRentContract); } //保存调整金额(预账单调整) @@ -1642,6 +1654,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxRentContractMapper.updateStatus(updateRentContract); logger.info("id:{},启动审批流成功,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } + }else{ + //合同状态改为记租中 + WxRentContract updateRentContract = new WxRentContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); + wxRentContractMapper.updateStatus(updateRentContract); } return resultData; From 3c76b2ec303e65a68fd7da384a2479c4179dc1d8 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 16:38:37 +0800 Subject: [PATCH 16/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81][=E4=BF=AE=E6=94=B9=E5=90=88=E5=90=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxPropertyContractServiceImpl.java | 10 +++++----- .../impl/WxRentContractServiceImpl.java | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 30e0f45ae..01d05bb16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -430,11 +430,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } }else{ - //合同状态改为记租中 - WxRentContract updateRentContract = new WxRentContract(); - updateRentContract.setId(record.getRentContractId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + //审批状态重置 + WxPropertyContract updateRentContract = new WxPropertyContract(); + updateRentContract.setId(record.getId()); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + wxPropertyContractMapper.updateByPrimaryKeySelective(updateRentContract); } return new ResultData(Result.SUCCESS, message, record); 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 51194402c..9e68f65cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -511,11 +511,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("id:{},启动审批流成功, 是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } }else{ - //合同状态改为记租中 + //审批状态重置 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + updateApplyStatus(updateRentContract); } //生成预览账单(补录第二步,第三步走编辑) @@ -574,11 +574,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("id:{},启动审批流成功 ,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } }else{ - //合同状态改为记租中 + //审批状态重置 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + updateApplyStatus(updateRentContract); } //保存调整金额(预账单调整) @@ -1655,11 +1655,11 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("id:{},启动审批流成功,是否补录:{}", record.getId().toString(), record.getMerchantId() != null); } }else{ - //合同状态改为记租中 + //审批状态重置 WxRentContract updateRentContract = new WxRentContract(); updateRentContract.setId(record.getId()); - updateRentContract.setStatus(EnumRentContractStatus.RENT_PAID.getCode()); - wxRentContractMapper.updateStatus(updateRentContract); + updateRentContract.setApplyStatus(EnumRentContractAppStatus.DEFAULT.getCode()); + updateApplyStatus(updateRentContract); } return resultData; From 3823cd7db347b9caea83d6d4078e4f93e466446e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 16 Sep 2019 16:40:25 +0800 Subject: [PATCH 17/24] =?UTF-8?q?[POS][=E4=BF=AE=E6=94=B9]:=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201909161634__POS_CHANGED.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201909161634__POS_CHANGED.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909161634__POS_CHANGED.sql b/mallinkAdmin/src/main/resources/db/migration/V201909161634__POS_CHANGED.sql new file mode 100644 index 000000000..672a579c9 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201909161634__POS_CHANGED.sql @@ -0,0 +1,3 @@ + +alter table wx_refund_order +change column `pos_refund_desc` `pos_refund_des` varchar(100) NULL COMMENT 'POS退款描述'; From fd9ae5436792b6d1ec382a986a22b99e40c09198 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 16 Sep 2019 16:48:48 +0800 Subject: [PATCH 18/24] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A3=80=E6=9F=A5=E9=A1=BA=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCreditHistoryServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 27284bbdc..f399f6a64 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -198,11 +198,11 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public WxCreditHistory saveOrUpdate(WxCreditHistory record) { WxCUser wxCUser = wxCUserMapper.selectByPrimaryKey(record.getCUserId()); - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); if (wxCUser == null) { //验证此用户是否存在 throw new MallinkException(ErrorCode.USER_IS_EMPTY); } + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); if(wxCUserBasicInfo == null) { throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); } From b5105bf9fa79fdc56c485180c729c4beeb5d4071 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 16 Sep 2019 17:09:28 +0800 Subject: [PATCH 19/24] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E7=AD=89=E8=A1=8C=E4=B8=BA=EF=BC=8Cbasic=5Fi?= =?UTF-8?q?nfo=E5=8F=AF=E8=83=BD=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCreditHistoryServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index f399f6a64..324631227 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -203,9 +203,6 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectByPrimaryKey(record.getCUserId()); - if(wxCUserBasicInfo == null) { - throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); - } if (StringUtils.isNotEmpty(record.getSpendStr())) { record.setSpend(new BigDecimal(record.getSpendStr()).multiply(new BigDecimal(100)).intValue()); } From ed796792b58d18c6fc0be0c3b751a6b142e899c6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 17:32:33 +0800 Subject: [PATCH 20/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81][=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B9=E5=90=8D=E7=A7=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V201909161731__L_FLOW.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql new file mode 100644 index 000000000..13d9039c2 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql @@ -0,0 +1,2 @@ + +alter table wx_bill_settle_record change column `desc` remark varchar(500); \ No newline at end of file From 0bf1a365f08ca64534e9996677ca150f98f484f2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 17:32:48 +0800 Subject: [PATCH 21/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81][=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B9=E5=90=8D=E7=A7=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V201909161731__L_FLOW.sql | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql b/mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql index 13d9039c2..76d08455a 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V201909161731__L_FLOW.sql @@ -1,2 +1,4 @@ - -alter table wx_bill_settle_record change column `desc` remark varchar(500); \ No newline at end of file +update wx_flow_config set name='商铺租金+物业合同签约' where name ='商铺租赁合同签约'; +update wx_flow_config set name='商铺租金+物业合同终止' where name ='商铺租赁合同终止'; +update wx_flow_config set name='多经点位租金+物业合同签约' where name ='多经点位商铺租赁合同签约'; +update wx_flow_config set name='多经点位租金+物业合同终止' where name ='多经点位商铺租赁合同终止'; \ No newline at end of file From 1c58fda822d5f0d595d236d0b63768b3de909c2f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 16 Sep 2019 17:45:28 +0800 Subject: [PATCH 22/24] =?UTF-8?q?[=E9=80=80=E6=AC=BE][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E5=8F=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxRefundOrderServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index fcb615f4d..09ba62644 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -542,7 +542,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { try { signMap = BeanUtils.toStringMap(wxRefundOrderSP); } catch (Exception e) { - logger.error("退款命令生辰: " + e.getMessage()); + logger.error("退款命令生成: " + e.getMessage()); throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "退款签名异常"); } @@ -580,7 +580,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { errMsg = errObj.toJSONString(); record.setFailReason(errMsg); } else { - errMsg = returnMap.get("return_msg"); + errMsg = returnMap.get("err_code_des"); record.setFailReason(errMsg); } record.setRefundOrderStatus(EnumRefundStatus.REFUND_REQ_FAIL.getCode()); From 8d04ec54e792ba790526848543433ef843b7bc17 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 16 Sep 2019 18:30:36 +0800 Subject: [PATCH 23/24] =?UTF-8?q?[=E5=88=B8=E8=AE=A2=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=88=B8=E8=AE=A2=E5=8D=95=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=88=B8=E8=A1=A5=E8=B4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponOrderMapper.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 9de3c6797..8663c25d8 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -587,7 +587,7 @@ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, - c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_num, + c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, (case when com.mc=1 then (select m.name from wx_merchant m, wx_coupon_merchant cm where m.id = cm.merchant_id and cm.product_id=co.coupon_id and cm.status = 0) else '[多商户通用]' end) as merchant_name, @@ -598,7 +598,7 @@ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, - c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,c.subsidy_num, + c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num, bu.name, bu.phone as bphone, cu.phone, m.name as merchant_name,m.id as merchant_id @@ -606,8 +606,8 @@ From f753b063db0ca2ce1b2933a9cd68d3ab640f0926 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 16 Sep 2019 19:19:13 +0800 Subject: [PATCH 24/24] =?UTF-8?q?[=E4=BF=AE=E6=94=B9][=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=B5=81][=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=89=B9=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=A1=B9=E5=90=8D=E7=A7=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxBillSettleServiceImpl.java | 42 +- .../mapper/WxBillSettleBillMapper.xml | 394 +++++++++--------- 2 files changed, 232 insertions(+), 204 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 48ad4eae4..17ffefac5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -188,7 +188,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay() ); //押金是ReceivePay wxBillRent.setPayDate(new Date()); - wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -206,7 +210,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillOtherDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay()); wxBillOtherDeposit.setPayDate(new Date()); - wxBillOtherDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillOtherDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillOtherDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -224,7 +232,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+ dbBill.getReceivePay()); propertyDeposit.setPayDate(new Date()); - propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + propertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -260,7 +272,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); propertyDeposit.setPayDate(new Date()); - propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + propertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -295,7 +311,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); wxBillRent.setPayDate(new Date()); - wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -321,7 +341,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { wxBillRent.setPay(dbBill.getPay()+dbBill.getReceivePay()); wxBillRent.setPayDate(new Date()); - wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + wxBillRent.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + wxBillRent.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } @@ -373,7 +397,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { if(dbBill!=null) { propertyDeposit.setPay(dbBill.getPay()+dbBill.getReceivePay()); propertyDeposit.setPayDate(new Date()); - propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + if(EnumSettleBillType.R.getCode().equals(bill.getType())){ + propertyDeposit.setStatus(EnumBillRentStatus.PAID.getCode()); + }else{ + propertyDeposit.setStatus(EnumBillRentStatus.RETURN.getCode()); + } addBillAction(bill.getBillId(), dbBill.getOwe()); } } diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index d3e272415..40b9abb20 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -1,214 +1,214 @@ - - - + + + - - - - - - + + + + + + - - - - + + + + - + - + `id`,`tenant_id`,`settle_id`,`type`,`bill_id`,`bill_type` ,`createtime`,`updatetime` - - where 1=1 - and `id` = #{id} - and `tenant_id` = #{tenantId} - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - + + where 1=1 + and `id` = #{id} + and `tenant_id` = #{tenantId} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + delete from wx_bill_settle_bill where settle_id = #{id} - +