台桌统计报表

cash-api/account-server/src/main/resources/application.yml

@@ -1,7 +1,5 @@
 server:
   port: 9100
-  servlet:
-    context-path: /account
 
 spring:
   application:

cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java

@@ -2,17 +2,17 @@ package com.czg.controller;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.CzgPayUtils;
-import com.czg.account.service.MemberPointsService;
 import com.czg.entity.CzgBaseRespParams;
 import com.czg.mq.PrintMqListener;
 import com.czg.order.service.OrderInfoService;
-import com.czg.order.service.ShopOrderStatisticService;
 import com.czg.task.StatisticTask;
 import com.czg.utils.AssertUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author ww
@@ -30,26 +30,18 @@ public class NotifyController {
     @Resource
     private StatisticTask statisticTask;
 
-    @DubboReference
-    private MemberPointsService pointsService;
 
-    @Resource
-    private ShopOrderStatisticService shopOrderStatisticService;
-
-
-    @GetMapping("/payCallBack")
-    public String notifyCallBack() {
-
-        shopOrderStatisticService.statistic();
-        //JSONObject czg = CzgPayUtils.getCzg(respParams);
-        //AssertUtil.isNull(czg, "支付回调数据为空");
-        //log.info("支付回调数据为:{}", czg);
-        //orderInfoService.payCallBackOrder(czg.getString("mchOrderNo"), czg);
+    @RequestMapping("/payCallBack")
+    public String notifyCallBack(@RequestBody CzgBaseRespParams respParams){
+        JSONObject czg = CzgPayUtils.getCzg(respParams);
+        AssertUtil.isNull(czg, "支付回调数据为空");
+        log.info("支付回调数据为:{}", czg);
+        orderInfoService.payCallBackOrder(czg.getString("mchOrderNo"), czg);
         return SUCCESS;
     }
 
     @RequestMapping("/refundCallBack")
-    public String refundCallBack(@RequestBody CzgBaseRespParams respParams) {
+    public String refundCallBack(@RequestBody CzgBaseRespParams respParams){
         JSONObject czg = CzgPayUtils.getCzg(respParams);
         AssertUtil.isNull(czg, "退款回调数据为空");
         log.info("退款回调数据为:{}", czg);
@@ -59,7 +51,6 @@ public class NotifyController {
 
     @Resource
     private PrintMqListener printMqListener;
-
     @RequestMapping("/test")
     public void test(@RequestParam String id) {
         printMqListener.orderPrint(id);

cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java

@@ -27,8 +27,8 @@ public class StatisticTask {
         long start = System.currentTimeMillis();
         log.info("定时任务执行，开始统计数据");
         shopOrderStatisticService.statistic();
-        //shopProdStatisticService.statistic();
-        //shopTableOrderStatisticService.statistic();
+        shopProdStatisticService.statistic();
+        shopTableOrderStatisticService.statistic();
         log.info("定时任务执行完毕，耗时:{}ms", start - System.currentTimeMillis());
     }
 }

cash-api/order-server/src/main/resources/application.yml

@@ -1,7 +1,5 @@
 server:
   port: 9200
-  servlet:
-    context-path: /order
 
 spring:
   application:

cash-api/product-server/src/main/java/com/czg/ProductApplication.java

@@ -18,7 +18,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 public class ProductApplication {
 
     public static void main(String[] args) {
-
         SpringApplication.run(ProductApplication.class, args);
     }
 

cash-api/product-server/src/main/resources/application.yml

@@ -1,7 +1,5 @@
 server:
   port: 9300
-  servlet:
-    context-path: /product
 
 spring:
   application:

cash-api/system-server/src/main/resources/application.yml

@@ -1,7 +1,5 @@
 server:
   port: 9400
-  servlet:
-    context-path: /system
 
 spring:
   application: