diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 0a4f55ef3..bc033b620 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -10,12 +10,10 @@ import com.iformall.service.WxBusinessService; import com.iformall.service.WxSubBusinessService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.commons.collections.map.LinkedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; 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 af7cd9852..cfc19a689 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -13,7 +13,6 @@ import org.springframework.amqp.core.AmqpTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; - import java.util.UUID; /** @@ -32,15 +31,16 @@ public class RabbitMqMessageProducer implements MqBaseProducer { @Autowired private WxMsgRecordService wxMsgRecordService; - @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)); - wxMsgRecordService.save(data); + data.setMsgStatus(EnumMsgRecordStatus.SEND_SUCC.getCode()); + wxMsgRecordMapper.update(data); } catch (Exception e) { log.error("RabbitMqMessageProducer: Send Message Error ", e); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index b3432f9d1..fa6346793 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -138,7 +138,7 @@ public class WxFlowServiceImpl implements WxFlowService { if(supplement!=null && supplement && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { wxRentContractService.updateRentContractStatus(businessId); } - }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ + }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ WxPropertyContract wxPropertyContract = new WxPropertyContract(); wxPropertyContract.setId(businessId); wxPropertyContract.setApplyStatus(applyStatus); 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 658cbde2d..714ff5b00 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -46,7 +46,7 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { msgRecord.setUuid(data.getUuid()); msgRecord.setId(idWorker.nextId()); msgRecord.setMsgJson(JsonUtil.obj2Json(data)); - msgRecord.setMsgStatus(EnumMsgRecordStatus.SEND_SUCC.getCode()); + msgRecord.setMsgStatus(EnumMsgRecordStatus.DEFAULT.getCode()); wxMsgRecordMapper.save(msgRecord); } diff --git a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml index f907f14a0..6e02cd58f 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgRecordMapper.xml @@ -63,9 +63,11 @@ update wx_msg_record set updatetime = now() ,msg_status = #{msgStatus} ,status_message = #{statusMessage} - - and uuid = #{uuid} - + where id in( + select t.id from ( + select id from wx_msg_record where uuid = #{uuid} + ) t + ) - update wx_topic set status = 3 where now() >= end_time and tenant_id = #{tenantId} + update wx_topic set status = 3 where id in( + select t.id from ( + select id from wx_topic where status !=3 and now() >= end_time and tenant_id = #{tenantId} + ) t + ) - - update wx_coupon_channel set status = 1 where target_ad = 8 and sub_target_id in( + update wx_coupon_channel set status = 1 where status = 0 and target_ad = 8 and sub_target_id in( select id from wx_topic where status in(2,3) and tenant_id = #{tenantId} ) -