Merge remote-tracking branch 'origin/master'

2025-03-07 18:31:10 +08:00
parent 626f23b45b f6e2728695
commit e5ce741647
61 changed files with 1170 additions and 173 deletions
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/PrintMachineController.java
@@ -1,6 +1,7 @@
 package com.czg.controller.admin;

 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSONArray;
 import com.czg.account.dto.print.PrinterAddDTO;
 import com.czg.account.dto.print.PrinterDelDTO;
 import com.czg.account.dto.print.PrinterEditDTO;
@@ -50,7 +51,13 @@ public class PrintMachineController {
            queryWrapper.eq(PrintMachine::getSubType, subType);
        }
        queryWrapper.orderBy(PrintMachine::getSort, true).orderBy(PrintMachine::getId, false);
-        return CzgResult.success(printMachineService.page(PageUtil.buildPage(), queryWrapper));
+        Page<PrintMachine> page = printMachineService.page(PageUtil.buildPage(), queryWrapper);
+        page.getRecords().forEach(item -> {
+            if (StrUtil.isNotBlank(item.getCategoryIds())) {
+                item.setCategoryList(JSONArray.parse(item.getCategoryIds()));
+            }
+        });
+        return CzgResult.success(page);
    }

    /**
@@ -61,7 +68,11 @@ public class PrintMachineController {
    @SaAdminCheckPermission(value = "printer:detail", name = "打印机详情获取")
    @GetMapping("/detail")
    public CzgResult<PrintMachine> detail(@RequestParam Integer id) {
-        return CzgResult.success(printMachineService.getOne(new QueryWrapper().eq(PrintMachine::getId, id).eq(PrintMachine::getShopId, StpKit.USER.getShopId())));
+        PrintMachine printMachine = printMachineService.getOne(new QueryWrapper().eq(PrintMachine::getId, id).eq(PrintMachine::getShopId, StpKit.USER.getShopId()));
+        if (printMachine != null && StrUtil.isNotBlank(printMachine.getCategoryIds())) {
+            printMachine.setCategoryList(JSONArray.parse(printMachine.getCategoryIds()));
+        }
+        return CzgResult.success(printMachine);
    }


--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/TableOrderStatisticController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/TableOrderStatisticController.java
@@ -1,35 +0,0 @@
-package com.czg.controller.admin;
-
-import com.czg.account.entity.ShopTableOrderStatistic;
-import com.czg.account.service.ShopTableOrderStatisticService;
-import com.czg.annotation.SaAdminCheckPermission;
-import com.czg.resp.CzgResult;
-import com.czg.sa.StpKit;
-import com.mybatisflex.core.paginate.Page;
-import jakarta.annotation.Resource;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 桌台订单统计
- * @author Administrator
- */
-@RestController
-@RequestMapping("/admin/tableOrderStatistic")
-public class TableOrderStatisticController {
-    @Resource
-    private ShopTableOrderStatisticService orderStatisticService;
-
-    /**
-     * 桌台统计列表
-     * @param startTime 开始时间
-     * @param endTime 结束时间
-     * @return 统计信息
-     */
-    @SaAdminCheckPermission(value = "tableOrderStatistic:list", name = "台桌订单统计列表")
-    @GetMapping
-    public CzgResult<Page<ShopTableOrderStatistic>> list(String startTime, String endTime) {
-        return CzgResult.success(orderStatisticService.summary(StpKit.USER.getShopId(), startTime, endTime));
-    }
-}
--- a/cash-api/account-server/src/main/resources/application.yml
+++ b/cash-api/account-server/src/main/resources/application.yml
@@ -24,6 +24,9 @@ mybatis-flex:
 wx:
  appId: wxd88fffa983758a30
  secrete: a34a61adc0602118b49400baa8812454
+  account:
+    appId: wx212769170d2c6b2a
+    secrete: 8492a7e8d55bbb1b57f5c8276ea1add0

 alipay:
  serverUrl: https://openapi.alipay.com/gateway.do
@@ -31,6 +34,12 @@ alipay:
  privateKey: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCAjDBuS8K/IJb9ui+KuNm/sTUdEiaji4BNpZ92avO1N5JpNlGmac6ec4p3tNFT950sBLcQkClcUpQxUHQzAT6DYNNXOKyvfI/EmcqwCw6PaMNLs/8cV//J2WWZBUhLaOsjKurpm9/3W5MnTh4BGxIfBoeBMA8f8K3BgKdmyKtvIEV2h2cyjsMskdn+g6oNZcmWcms0pvpPHyH46mRaGFhpp0v19wX3WsamGldh1L2VntmaDN3C2XbSrXv90XYp5bEUqwTbLwXpMAlzTibF56d/iqv9oYi8cpAKougUFLOymnbutLNs2tLrEDSFwHcmG2/wbZHybZyYcIgFgv4arf+tAgMBAAECggEAf7hKKlw1y6Z6vvAtalxNZUuRZSfyog3p1bwYWxTavZPQcZ7Zs0lvVDmiO1u5m/7q96BbryY9IhCeUv0H5uF2lhwu/3s9AEL3qTPQkeb6eXxyhhX6A9RfPdM1Qbtg4CQHdHKg4qjP9znSVHwmDZ0y/QaEvdPdQzPjv92u9c2tn4N4x6XyBYcU5gzxiJNnIugCmBgcJo/3H2fgV+XXEhORPvy5of9b4oATHEaLS/8dAS2wuOjhzaGS4MXp3VkXn3XaYjwSzaL03qYWA+xm+aO5sJv8bmqZW7sNVck5o3sPo7cQ4VkBFVzyrRdmJcxcSRJ9MsB9JsrhoKI8pgaXrVie4QKBgQDU2vai0lpBIK/0jzRpPNoqdT8lnafnnWni8nU4kfAh+gCLi+HBPhQRT0kv4unQc2q2/gALE7sgZVO00JGY5a3R0orsojPoUSZlpypGW7GGqKy576NHn0nw4o/PdfysT92VWgt1hlfTf6qfCDhfE9APU+RGvlSWXcT8nxVel3iUaQKBgQCamoJN6+4v+chJvL2nqV8NVVRLp0vDIHxs1QOtKwUodx8Qp1D6CJYtavCXn8aNUFVNQJPJ7TQPpJjXP2rI4SN01weDwx+I+wh8PBGHV6/234R+6TvFgY1PrYgCdfNP4i/E7B4uyEhAxdU73PB8qkqRAeJGok05p7oG71KCOBiYpQKBgEZfGflcuDAeAW5GRhqg3rP4zWa/R7qgZVh9tll8jjp9b96y4XFE99d9MgId8BVVgyt6sEL5Q/2C4ni+F9TH4n6jMADp42VkJuCmsqhOOlP9whU67+2G8Sgtj0QUivPg964f9ffl8XVgGOW5DwIIB9p5btggptCLscufQK5kP545AoGADBvf6tR4wl8w9b2HqTMV08iEIqzGvVC1Dh0c/Zop/EJgN4CzUfIMOSBwGaAVAApzs+pD6QPgGP2OTwWTioo/qa4R05sbxDHNN1XJFa2jhZV6HiqMWOrNs5jm1zJ/zRjtHuJTdtyO9CvKiLbESy9XScY4/8lEfSiK5HIoJzTXkFUCgYAkYkvkW6psJpWj05XWq44UN0n6QOU/Igl35Um/iuOMVhsTmIt09STQVTuzJzfH82+sCqoRsD1blE5unKNUC1DK77aNKTv3Z0dxN9R7FAyfZRiYQXTrbBPBqWjay6FCNxn8e8UsJN4Z6FIV2LGlQI114krSap1MALKLVvnld0NaUQ==
  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQkrz+emAuS1mB3KKDOMmAZRd/BlPbh7fAIHAqAj1+QCZNcV3o2BTLIIqnuKpSlFXDG3uDzp2VsBxcizXuBbFyPGylnD9CgCj5abyh3+FIHPAZ2IM3TtpqImZ0TSPGXrMli4Nir7MvZktgccCqQKCC4o6iaDGz+UwWwJUIPna8fm2tiTZ+KH150CZbKVj4ZGNpBh5XSV/1dRgyQIV9D/EwSbkZ0n6VgKQLJBi0C2UE3QB17aL1Ir6+gDXIDbknN8O7GUD3aMGdThYdSRUb5wp9CZ5qfV7vCS/CgaRo38nhH3NOzkTL+7v0m1ZDHPmqEkn9VzZN6sCQdL7PoAOjHOCwIDAQAB
  encryptKey: Hp1TbhOqevbHCA5ji/VlqQ==
+  account:
+    appId: 2021004174605036
+    privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD48HaUoV7OH7os+9L01kHgxzwIhJick4OkFq4aHsntsXEJ  J3gedhuEZtV8oHKZ30DPW12IJ4S8NXtpr8OWaqrAPFonf4wVaRY1d0yIAea57kfLEn9oOEEy4FzARgMNDkyxC+/3OUdGbLHpTjfVX3gusXsEhUDy1/WewihAkoNYF37+W3W/uVLzeWoPq0EcUbRv/G/t/p6gL69ltsMAiVFG4Q/Yk24YAN6lYgBPNLXUEwQ1Q+T+1omjfavHgvarKOp33z3JOUH+aGOmDsJ5Y9gyGtJzOCipAd8Zcv+T1ygsEzZYO1/gzcbPnfO1ShqStCHzssuw8FBVx2JdfQKXKMMNAgMBAAECggEAVTrO/pg5Q00titU1Jspsh67u6OOs9H605Ws2dI7yB8VmtAGlaJh7V1t14FN2qSP8poHbhhAxq9aLyGV7C3a9u09udnN+3J28EtYjh7VO732bavWMVXxdJjQWzWWrCb9JlpxFrlkYBA6W4w/6ob0sAqCVQ7jzwbEa0R4cde8ztOa5nysKSfr4YTSs0gqvoiC6fmg8eiRJraEQBoYz9VkKFtOhhh/4w5FhVcYQ2gQvZ3kK3QVuD1eJIQKlCtz8qaox9lXKDiZT4SCmnKshdUL0u5TYIcYeBjZmhJz0Q50KHcpZrCs5y7I0+vRBH3hU+TKSQt7ureymwhbwWMHScLV2gQKBgQD+58SHXhr5M8NGagAmTdsgmCnNv2kOYMd4STyPMY10SVwCv1Bk808ZuP+7e558J1b5/OuDLI5dLq6xrZ/1wLv1G++XqxI00hlFuWS5mUGJVcXotT1mw20rVeUILc7Qe3mLvbMGgfyKf4A7Qa5SSZ4bDeDTJYaFxyiQ281hMzDuPQKBgQD6AiL/Na2/uPH4CG6juwpjYvYVUcjK+7gbRwf3wWsWMpk90Z4ju2iUiP5c1J/oK9P+1T3PIr6M4Xjza8JJj+r9KC/PVB0gBv6vVM96cDpKUEy/UMpcn/T81vqj/Z+WEOODU8Ms6NiTTm+u9ldvpCjbu0u8M+9c0JeIyadJvSTFEQKBgQCsxmFyM3nq8YfpgU2qqNjfBeRH3faSVUy+nj1a/YZYjKS+A/i1BCnYUImeBVNN6chNV342ggvY4xxruDiU9Vcw8wd58O09Oi8BEIFSP6upL6cebUI6Fjo3xlegLJRiwV6INkNTJOYM5hD/mSxUACwXQFfkJipBINXBIgraWD1RLQKBgQCj49axWq0F6+WjZVOyPaD3uh37p9trRUxRhWTxw3fB23WdktaKMgbCqHOmwzP4bRLSEVQtf2dOz1gMqu14b8HqJvgAf/F/11YJ9hz09LEhmjZVjE68HZfqT7uK2W5OX8/lfXmK7TFcj6SjG5YB96lZMhTZ0WnufEd6QkdKDZYXIQKBgQD9GDTcIMbFwbEaKHnfZaTD3f876EGRgsgrCxwdEk7LBCRPwWo7yI929M4psIlpNwNeiyjBkBunWIVkpznp6qPtJqagIPUYesU4f5v6/okq5wcpaNKSkWbIvWVLaLGOiA1aeGJtbpMpyClbSr52puHpRRdvAiIEQ74yYh0JX8q96g==
+    publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQkrz+emAuS1mB3KKDOMmAZRd/BlPbh7fAIHAqAj1+QCZNcV3o2BTLIIqnuKpSlFXDG3uDzp2VsBxcizXuBbFyPGylnD9CgCj5abyh3+FIHPAZ2IM3TtpqImZ0TSPGXrMli4Nir7MvZktgccCqQKCC4o6iaDGz+UwWwJUIPna8fm2tiTZ+KH150CZbKVj4ZGNpBh5XSV/1dRgyQIV9D/EwSbkZ0n6VgKQLJBi0C2UE3QB17aL1Ir6+gDXIDbknN8O7GUD3aMGdThYdSRUb5wp9CZ5qfV7vCS/CgaRo38nhH3NOzkTL+7v0m1ZDHPmqEkn9VzZN6sCQdL7PoAOjHOCwIDAQAB
+
+

 pagehelper:
  helper-dialect: mysql
--- a/cash-api/account-server/src/main/resources/logback.xml
+++ b/cash-api/account-server/src/main/resources/logback.xml
@@ -2,9 +2,9 @@
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
    <contextName>account-server</contextName>
    <property name="log.charset" value="utf-8" />
-    <property name="log.pattern" value="[account-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
+    <property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
    <!--写入文件格式-->
-    <property name="p_file" value="[account-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
+    <property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
    <!--输出到控制台-->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
--- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.czg.CzgPayUtils;
 import com.czg.entity.CzgBaseRespParams;
 import com.czg.order.service.OrderInfoService;
+import com.czg.task.StatisticTask;
 import com.czg.utils.AssertUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -24,6 +25,9 @@ public class NotifyController {
    @Resource
    private OrderInfoService orderInfoService;

+    @Resource
+    private StatisticTask statisticTask;
+

    @RequestMapping("/payCallBack")
    public String notifyCallBack(@RequestBody CzgBaseRespParams respParams){
@@ -42,4 +46,9 @@ public class NotifyController {
        orderInfoService.refundCallBackOrder(czg.getString("mchOrderNo"), czg);
        return SUCCESS;
    }
+
+    @RequestMapping("/test")
+    public void test() {
+        statisticTask.run();
+    }
 }
--- a/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
@@ -146,8 +146,7 @@ public class OrderPayController {
     * checkOrderPay.orderAmount 必填
     */
    @PostMapping("/shopPayApi/js2Pay")
-    public CzgResult<Map<String, Object>> js2PayOrder(@RequestHeader Long shopId, HttpServletRequest request, @RequestBody OrderPayParamDTO payParam) {
-        payParam.setShopId(shopId);
+    public CzgResult<Map<String, Object>> js2PayOrder(HttpServletRequest request, @RequestBody OrderPayParamDTO payParam) {
        return payService.js2PayOrder(ServletUtil.getClientIP(request), payParam);
    }

--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
@@ -6,6 +6,7 @@ import com.czg.order.dto.OrderInfoQueryDTO;
 import com.czg.order.dto.OrderInfoRefundDTO;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.service.OrderInfoService;
+import com.czg.order.vo.HistoryOrderPrintVo;
 import com.czg.order.vo.HistoryOrderVo;
 import com.czg.order.vo.OrderInfoVo;
 import com.czg.resp.CzgResult;
@@ -49,6 +50,11 @@ public class AdminOrderController {
        return orderInfoService.getOrderDetails(orderId);
    }

+    @GetMapping("/getOrderByIdPrint")
+    public CzgResult<HistoryOrderPrintVo> getOrderByIdPrint(Long orderId) {
+        return orderInfoService.getOrderByIdPrint(orderId);
+    }
+
    @GetMapping("/historyOrder")
    public CzgResult<HistoryOrderVo> historyOrder(
            @RequestParam(required = false) Long orderId,
@@ -65,6 +71,16 @@ public class AdminOrderController {
        return CzgResult.success(orderInfoService.createOrder(addDto));
    }

+//    /**
+//     * 合单
+//     * @param refundDTO
+//     * @return
+//     */
+//    @PostMapping("/mergeOrder")
+//    public CzgResult<Object> mergeOrder(@Validated @RequestBody OrderInfoRefundDTO refundDTO) {
+//
+//    }
+
    /**
     * 订单全额退款 只传订单id
     * 部分退款 传参refundDetail
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
@@ -12,6 +12,7 @@ import com.czg.utils.AssertUtil;
 import com.czg.utils.ServletUtil;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

 import java.util.Map;
@@ -23,6 +24,7 @@ import java.util.Map;
 * @author ww
 * @description
 */
+@Slf4j
@RestController
@RequestMapping("/user/order")
 public class UserOrderController {
@@ -58,7 +60,9 @@ public class UserOrderController {
    @PostMapping("/createOrder")
    public CzgResult<OrderInfo> createOrder(@RequestBody OrderInfoAddDTO addDto) {
        addDto.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
-        addDto.setUserId(StpKit.USER.getLoginIdAsLong());
+        long loginIdAsLong = StpKit.USER.getLoginIdAsLong();
+        log.info("获取到的用户Id为:{}", loginIdAsLong);
+//        addDto.setUserId(StpKit.USER.getLoginIdAsLong());
        addDto.setShopId(StpKit.USER.getShopId());
        addDto.setOrderType("miniapp");
        return CzgResult.success(orderInfoService.createOrder(addDto));
--- a/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/StatisticTask.java
@@ -0,0 +1,24 @@
+package com.czg.task;
+
+import com.czg.order.service.ShopOrderStatisticService;
+import com.czg.order.service.ShopProdStatisticService;
+import com.czg.order.service.ShopTableOrderStatisticService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ */
+@Component
+public class StatisticTask {
+    @Resource
+    private ShopTableOrderStatisticService shopTableOrderStatisticService;
+    @Resource
+    private ShopProdStatisticService shopProdStatisticService;
+    @Resource
+    private ShopOrderStatisticService shopOrderStatisticService;
+
+    public void run() {
+        shopOrderStatisticService.statistic();
+    }
+}
--- a/cash-api/order-server/src/main/resources/logback.xml
+++ b/cash-api/order-server/src/main/resources/logback.xml
@@ -2,9 +2,9 @@
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
    <contextName>order-server</contextName>
    <property name="log.charset" value="utf-8" />
-    <property name="log.pattern" value="[order-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
+    <property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
    <!--写入文件格式-->
-    <property name="p_file" value="[order-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
+    <property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
    <!--输出到控制台-->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
--- a/cash-api/product-server/src/main/resources/logback.xml
+++ b/cash-api/product-server/src/main/resources/logback.xml
@@ -2,9 +2,9 @@
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
    <contextName>product-server</contextName>
    <property name="log.charset" value="utf-8" />
-    <property name="log.pattern" value="[product-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
+    <property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
    <!--写入文件格式-->
-    <property name="p_file" value="[product-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
+    <property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
    <!--输出到控制台-->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
--- a/cash-api/system-server/src/main/resources/logback.xml
+++ b/cash-api/system-server/src/main/resources/logback.xml
@@ -2,9 +2,9 @@
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
    <contextName>system-server</contextName>
    <property name="log.charset" value="utf-8" />
-    <property name="log.pattern" value="[system-server] %yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
+    <property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
    <!--写入文件格式-->
-    <property name="p_file" value="[system-server] %d | [%thread] %-5level %c [%L] - %msg %n"/>
+    <property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
    <!--输出到控制台-->
    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>