From ac7a9d9c4ca7b271031cb270988a3dbe7a2e850b Mon Sep 17 00:00:00 2001
From: perry <292303709@qq.com>
Date: Wed, 24 May 2023 18:10:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/controller/admin/notify/WxPayNotifyController.java   | 2 +-
 .../shop/service/category/impl/CategoryServiceImpl.java       | 1 -
 .../module/shop/service/order/impl/OrderServiceImpl.java      | 4 ++--
 .../module/shop/service/order/impl/StoreOrderServiceImpl.java | 2 +-
 yudao-server/src/main/resources/application-local.yaml        | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java
index 3f665e32b..4f1b31759 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java
@@ -46,7 +46,7 @@ public class WxPayNotifyController {
     private StoreOrderService storeOrderService;
     @Autowired
     private RechargeOrderMapper rechargeOrderMapper;
-
+    @Autowired
     private PhoneRecordService phoneRecordService;
 
 
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java
index 2fd93790a..cdd14f808 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java
@@ -317,7 +317,6 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
                 list.add(tree);
             }
         }
-        log.info("无限极分类 : getTree:" + JsonUtils.toJsonString(list));
         return list;
     }
 
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
index ed0231f75..ded5c0bdf 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
@@ -325,13 +325,13 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public OrderDataResponse orderData(String dateLimit, Integer type, String payType) {
         OrderDataResponse response = new OrderDataResponse();
-        if (type.equals(2)) {
+        if (type!=null && type==2) {
             type = null;
         }
         // 已完成订单数量
         response.setCompleteCount(getCount(dateLimit, Constants.ORDER_STATUS_COMPLETE, type));
         // 待核销订单数量
-        response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type));
+//        response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type));
         // 支付订单总数
         response.setOrderCount(getCount(dateLimit, Constants.ORDER_STATUS_ALL, type));
         // 待收货订单数量
diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
index 7c7cba6a7..d4dc24d0c 100644
--- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
+++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
@@ -1275,7 +1275,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
             phoneRecordAdd.setMoney(info.getPrice());
             phoneRecordAdd.setOrderNo(orderDO.getOrderId());
             phoneRecordAdd.setOrderTime(LocalDateTimeUtil.formatNormal(orderDO.getPayTime().toLocalDate()));
-            phoneRecordAdd.setGear(rechargeGearDO.getRefundAmount().toString());
+            phoneRecordAdd.setGear(rechargeGearDO.getRefundAmount().intValue()+"");
             phoneRecordAdds.add(phoneRecordAdd);
             recordDOS.add(phoneRecordDO);
         });
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index 577224347..ff034d196 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -255,5 +255,5 @@ justauth:
     timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
 
 phone:
-  query-url: http://192.168.1.189:4006/cyywl-phone-query-api/
+  query-url: http://phone.cyywl.top/cyywl-phone-query-api/
   token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0
\ No newline at end of file