!67 mq订阅标签规范代码 店铺流水调用售后模块直接船渡wrapper调整 去除无效的注解

Merge pull request !67 from chopper711/liushuai

consumer/src/main/java/cn/lili/event/impl/FullDiscountExecute.java

@@ -26,7 +26,7 @@ import cn.lili.modules.order.trade.entity.dos.OrderLog;
 import cn.lili.modules.order.trade.service.OrderLogService;
 import cn.lili.modules.promotion.service.MemberCouponService;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.rocketmq.tags.OrderTagsEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -190,7 +190,7 @@ public class FullDiscountExecute implements TradeEvent, OrderStatusChangeEvent {
         orderMessage.setPaymentMethod(order.getPaymentMethod());
         orderMessage.setNewStatus(OrderStatusEnum.PAID);
 
-        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.STATUS_CHANGE.name();
+        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.STATUS_CHANGE.name();
         //发送订单变更mq消息
         rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(orderMessage), RocketmqSendCallbackBuilder.commonCallback());
 

consumer/src/main/java/cn/lili/listener/OrderMessageListener.java

@@ -2,7 +2,7 @@ package cn.lili.listener;
 
 import cn.hutool.json.JSONUtil;
 import cn.lili.cache.Cache;
-import cn.lili.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.rocketmq.tags.OrderTagsEnum;
 import cn.lili.event.OrderStatusChangeEvent;
 import cn.lili.event.TradeEvent;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
@@ -58,7 +58,7 @@ public class OrderMessageListener implements RocketMQListener<MessageExt> {
      */
     public void orderStatusEvent(MessageExt messageExt) {
 
-        switch (MqOrderTagsEnum.valueOf(messageExt.getTags())) {
+        switch (OrderTagsEnum.valueOf(messageExt.getTags())) {
             //订单创建
             case ORDER_CREATE:
                 String key = new String(messageExt.getBody());

framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleVO.java

@@ -1,7 +1,6 @@
 package cn.lili.modules.order.aftersale.entity.vo;
 
 import cn.lili.modules.order.aftersale.entity.dos.AfterSale;
-import jdk.nashorn.internal.objects.annotations.Getter;
 import lombok.Data;
 
 /**
@@ -15,7 +14,6 @@ public class AfterSaleVO extends AfterSale {
     /**
      * 初始化自身状态
      */
-    @Getter
     public AfterSaleAllowOperation getAfterSaleAllowOperationVO() {
 
         //设置订单的可操作状态

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -50,7 +50,7 @@ import cn.lili.common.security.OperationalJudgment;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.GoodsTagsEnum;
-import cn.lili.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.rocketmq.tags.OrderTagsEnum;
 import cn.lili.trigger.enums.DelayTypeEnums;
 import cn.lili.trigger.interfaces.TimeTrigger;
 import cn.lili.trigger.message.PintuanOrderMessage;
@@ -461,7 +461,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     public void sendUpdateStatusMessage(OrderMessage orderMessage) {
-        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.STATUS_CHANGE.name();
+        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.STATUS_CHANGE.name();
         //发送订单变更mq消息
         rocketMQTemplate.asyncSend(destination, JSONUtil.toJsonStr(orderMessage), RocketmqSendCallbackBuilder.commonCallback());
     }

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java

@@ -160,7 +160,7 @@ public class StoreFlowServiceImpl extends ServiceImpl<StoreFlowMapper, StoreFlow
         //最终结算金额
         storeFlow.setBillPrice(CurrencyUtil.add(CurrencyUtil.add(storeFlow.getFinalPrice(), storeFlow.getDistributionRebate()), storeFlow.getCommissionPrice()));
         //获取第三方支付流水号
-        RefundLog refundLog = refundLogService.getOne(new LambdaQueryWrapper<RefundLog>().eq(RefundLog::getAfterSaleNo, afterSale.getSn()));
+        RefundLog refundLog = refundLogService.queryByAfterSaleSn(afterSale.getSn());
         storeFlow.setTransactionId(refundLog.getReceivableNo());
         storeFlow.setPaymentName(refundLog.getPaymentName());
         this.save(storeFlow);

framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java

@@ -10,4 +10,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-12-19 09:25
  */
 public interface RefundLogService extends IService<RefundLog> {
+    /**
+     * 根据售后sn查询退款日志
+     * @param sn
+     * @return
+     */
+    RefundLog queryByAfterSaleSn(String sn);
 }

framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java

@@ -3,9 +3,8 @@ package cn.lili.modules.payment.serviceimpl;
 import cn.lili.modules.payment.entity.RefundLog;
 import cn.lili.modules.payment.mapper.RefundLogMapper;
 import cn.lili.modules.payment.service.RefundLogService;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -19,5 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(rollbackFor = Exception.class)
 public class RefundLogServiceImpl extends ServiceImpl<RefundLogMapper, RefundLog> implements RefundLogService {
 
-
+    @Override
+    public RefundLog queryByAfterSaleSn(String sn) {
+        return this.getOne(new LambdaUpdateWrapper<RefundLog>().eq(RefundLog::getAfterSaleNo, sn));
+    }
 }

framework/src/main/java/cn/lili/rocketmq/tags/OrderTagsEnum.java

@@ -6,7 +6,7 @@ package cn.lili.rocketmq.tags;
  * @author paulG
  * @since 2020/12/9
  **/
-public enum MqOrderTagsEnum {
+public enum OrderTagsEnum {
 
     /**
      * 订单创建
@@ -20,7 +20,7 @@ public enum MqOrderTagsEnum {
 
     private final String description;
 
-    MqOrderTagsEnum(String description) {
+    OrderTagsEnum(String description) {
         this.description = description;
     }
 

manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java

@@ -1,7 +1,7 @@
 package cn.lili.test.rocketmq;
 
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.rocketmq.tags.MqOrderTagsEnum;
+import cn.lili.rocketmq.tags.OrderTagsEnum;
 import cn.lili.common.properties.RocketmqCustomProperties;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.junit.jupiter.api.Assertions;
@@ -29,7 +29,7 @@ class MsgExtRocketMqTest {
 
     @Test
     void searchAll() {
-        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.STATUS_CHANGE.name();
+        String destination = rocketmqCustomProperties.getOrderTopic() + ":" + OrderTagsEnum.STATUS_CHANGE.name();
         Message<String> message = MessageBuilder.withPayload("Context").build();
         rocketMQTemplate.asyncSend(destination, message, RocketmqSendCallbackBuilder.commonCallback());
         rocketMQTemplate.send(destination, message);