08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/order/OrderCloseConsumer.java

@@ -1,14 +1,13 @@
 package com.xingxi.mq.consumer.order;
 
 import com.alibaba.fastjson.JSON;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.github.binarywang.wxpay.bean.request.WxPayOrderQueryV3Request;
 import com.github.binarywang.wxpay.bean.request.WxPayRefundV3Request;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
 import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryV3Result;
 import com.github.binarywang.wxpay.bean.result.WxPayRefundV3Result;
-import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;
+import com.google.common.collect.Lists;
+import com.rabbitmq.client.Channel;
 import com.xingxi.business.Order.domain.Order;
 import com.xingxi.business.Order.domain.OrderDetail;
 import com.xingxi.business.Order.service.IOrderDetailService;
@@ -18,17 +17,12 @@ import com.xingxi.business.PaymentInfo.service.IPaymentInfoService;
 import com.xingxi.business.ProdInventory.domain.ProdInventory;
 import com.xingxi.business.ProdInventory.domain.ProdInventoryBill;
 import com.xingxi.business.ProdInventory.mapper.ProdInventoryBillMapper;
-import com.xingxi.business.ProdInventory.mapper.ProdInventoryMapper;
 import com.xingxi.business.RefundInfo.domain.RefundInfo;
 import com.xingxi.business.RefundInfo.service.impl.RefundInfoServiceImpl;
-import com.xingxi.common.annotation.Excel;
 import com.xingxi.common.enums.*;
-import com.xingxi.common.exception.BusinessException;
 import com.xingxi.common.mq.bo.order.OrderBO;
 import com.xingxi.common.mq.constant.OrderMqKey;
 import com.xingxi.common.mq.core.AbstractRabbitConsumer;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
 import com.xingxi.common.utils.DateUtils;
 import com.xingxi.mq.server.order.mapper.MqProdInventoryMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -36,8 +30,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
@@ -59,19 +51,16 @@ public class OrderCloseConsumer extends AbstractRabbitConsumer {
     @Resource
     private IPaymentInfoService paymentInfoService;
 
-    @Autowired
+    @Resource
     private ProdInventoryBillMapper prodInventoryBillMapper;
-    @Autowired
-    private ProdInventoryMapper prodInventoryMapper;
-    @Autowired
-    private MqProdInventoryMapper mqProdInventoryMapper;
-
 
+    @Resource
+    private MqProdInventoryMapper mqProdInventoryMapper;
 
-    @Autowired
+    @Resource
     private WxPayService wxPayService;
-    private WxPayConfig config;
-    @Autowired
+
+    @Resource
     private RefundInfoServiceImpl refundInfoServiceImpl;
 
 //    @Value("${wx.pay.refundcallbackUrl}")

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application-local.yml

@@ -16,7 +16,7 @@ spring:
         min-idle: 5       # 连接池中的最小空闲连接
   rabbitmq:
     xMsgTtl: 301000
-    host: mqtest.gululuq.com
+    host: mqserver.njnet.vip
     port: 5672
     username: developer01
     password: 123456

08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application.yml

@@ -30,7 +30,7 @@ spring:
 # MyBatis
 mybatis:
   # 搜索指定包别名
-  typeAliasesPackage: cn.com.xingxi.**.domain
+  typeAliasesPackage: com.xingxi.**.domain
   # 配置mapper的扫描，找到所有的mapper.xml映射文件
   mapperLocations: classpath*:mapper/**/*Mapper.xml
   # 加载全局的配置文件

08.src/Xingxi/xingxi-pay-utils/xingxi-unifiedpay-spring-boot-starter/src/main/java/com/xingxi/unifiedpay/configuration/XingxiUnifiedpayConfiguration.java

@@ -18,7 +18,6 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
 @ComponentScan(basePackages = {"com.xingxi.unifiedpay"})
-@ConditionalOnProperty(prefix = "spring.application.xingxi.unifiedpay", name = "enabled", havingValue = "true")
 @EnableConfigurationProperties(XingxiUnifiedpayWxPayProperties.class)
 @RequiredArgsConstructor
 @ConditionalOnBean(XingxiUnifiedpayRepository.class)
@@ -27,17 +26,16 @@ class XingxiUnifiedpayConfiguration {
 
     @Bean
     @ConditionalOnMissingBean(XingxiUnifiedpayCallbackServiceI.class)
-    XingxiUnifiedpayCallbackServiceI biandanUnifiedpayCallbackServiceI(){
+    XingxiUnifiedpayCallbackServiceI xingxiUnifiedpayCallbackServiceI(){
         return new XingxiUnifiedpayCallbackServiceI() {
             @Override
-            public void callbackFollowUpProcessing(XingxiUnifiedpayCallbackResultDTO biandanUnifiedpayCallbackResultDTO) {
-                throw new RuntimeException("业务实现[BiandanUnifiedpayCallbackServiceI]");
+            public void callbackFollowUpProcessing(XingxiUnifiedpayCallbackResultDTO xingxiUnifiedpayCallbackResultDTO) {
+                throw new RuntimeException("业务实现[XingxiUnifiedpayCallbackServiceI]");
             }
         };
     }
 
     @Bean("wxPayService")
-    @ConditionalOnProperty(prefix = "spring.application.xingxi.unifiedpay.wxpay", name = "enabled", havingValue = "true")
     WxPayService wxPayService() {
         final WxPayService wxPayService = new WxPayServiceImpl();
         WxPayConfig payConfig = new WxPayConfig();

08.src/Xingxi/xingxi-pay-utils/xingxi-unifiedpay-spring-boot-starter/src/main/java/com/xingxi/unifiedpay/configuration/XingxiUnifiedpayWxPayProperties.java

@@ -4,7 +4,7 @@ import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @Data
-@ConfigurationProperties(prefix = "spring.application.xingxi.unifiedpay.wxpay")
+@ConfigurationProperties(prefix = "wx.pay")
 public class XingxiUnifiedpayWxPayProperties {
 
     /**