修改结算单显示

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ptsettlement/vo/PtSettlementPageReqVO.java

@@ -27,6 +27,9 @@ public class PtSettlementPageReqVO extends PageParam {
     @Schema(description = "共计成本价格(高精度 + 成本)")
     private BigDecimal shopTotalHighAmount;
 
+    @Schema(description = "结算金额")
+    private Long settlementAmount;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ptsettlement/vo/PtSettlementRespVO.java

@@ -29,6 +29,9 @@ public class PtSettlementRespVO {
     @ExcelProperty("共计成本价格(高精度 + 成本)")
     private BigDecimal shopTotalHighAmount;
 
+    @Schema(description = "结算金额")
+    private Long settlementAmount;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/shopsettlement/vo/ShopSettlementPageReqVO.java

@@ -33,6 +33,9 @@ public class ShopSettlementPageReqVO extends PageParam {
     @Schema(description = "共计成本价格(高精度 + 成本)")
     private BigDecimal shopTotalHighAmount;
 
+    @Schema(description = "结算金额")
+    private Long settlementAmount;
+
     @Schema(description = "平台结算ID", example = "3176")
     private Long ptSettlementId;
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/shopsettlement/vo/ShopSettlementRespVO.java

@@ -40,6 +40,9 @@ public class ShopSettlementRespVO {
     @ExcelProperty("共计成本价格(高精度 + 成本)")
     private BigDecimal shopTotalHighAmount;
 
+    @Schema(description = "结算金额")
+    private Long settlementAmount;
+
     @Schema(description = "平台结算ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3176")
     @ExcelProperty("平台结算ID")
     private Long ptSettlementId;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptsettlement/PtSettlementDO.java

@@ -40,6 +40,10 @@ public class PtSettlementDO extends BaseDO {
      * 共计成本价格(高精度 + 成本)
      */
     private BigDecimal shopTotalHighAmount;
+    /**
+     * 已计算成本价
+     */
+    private Long settlementAmount;
     /**
      * 是否结账
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/shopsettlement/ShopSettlementDO.java

@@ -40,6 +40,10 @@ public class ShopSettlementDO extends BaseDO {
      * 销售额（积分 + 支付金额）
      */
     private Integer platformCollectionAmount;
+    /**
+     * 已计算成本价
+     */
+    private Long settlementAmount;
     /**
      * 抵扣积分
      */

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -110,6 +110,14 @@ public class TradeOrderController {
         PageResult<TradeOrderPageItemRespVO> data = TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems, userMap);
         for (TradeOrderPageItemRespVO tradeOrderPageItemRespVO : data.getList()) {
             tradeOrderPageItemRespVO.setSpuType(tradeOrderQueryService.getSpuTypeByList(tradeOrderPageItemRespVO.getItems()));
+            tradeOrderPageItemRespVO.setSettlementPrice(0L);
+
+            for (TradeOrderPageItemRespVO.Item item : tradeOrderPageItemRespVO.getItems()) {
+                if(item.getSettlementTime() != null){
+                    tradeOrderPageItemRespVO.setIsSettlement(true);
+                }
+                tradeOrderPageItemRespVO.setSettlementPrice(tradeOrderPageItemRespVO.getSettlementPrice() + item.getSettlementPrice());
+            }
         }
         return success(data);
     }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java

@@ -125,4 +125,10 @@ public class TradeOrderBaseVO {
     @Schema(description = "积分类型")
     private Integer integralType;
 
+    @Schema(description = "是否结算")
+    private Boolean isSettlement;
+
+    @Schema(description = "结算价")
+    private Long settlementPrice;
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java

@@ -3,6 +3,8 @@ package cn.newfeifan.mall.module.trade.controller.admin.order.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * 交易订单项 Base VO，提供给添加、修改、详细的子 VO 使用
  * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
@@ -63,4 +65,10 @@ public class TradeOrderItemBaseVO {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+
+    @Schema(description = "结算时间")
+    private LocalDateTime settlementTime;
+
+    @Schema(description = "结算价")
+    private Long settlementPrice;
 }

feifan-server/src/main/resources/application-prod.yaml

@@ -47,14 +47,14 @@ spring:
       primary: master
       datasource:
         master:
-          name: new-letcgo
-          url: jdbc:mysql://120.78.5.233:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          name: new-feifan
+          url: jdbc:mysql://120.78.5.233:3307/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: PA55W0RD
         slave: # 模拟从库，可根据自己需要修改
-          name: new-letcgo
+          name: new-feifan
           lazy: true # 开启懒加载，保证启动速度
-          url: jdbc:mysql://120.78.5.233:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:mysql://120.78.5.233:3307/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: root
           password: PA55W0RD
 
@@ -62,8 +62,8 @@ spring:
   redis:
     host: 47.107.29.61 # 地址
     port: 6379 # 端口
-    database: 0 # 数据库索引
-#    password: 123456 # 密码，建议生产环境开启
+    database: 2 # 数据库索引
+    password: FF@QWQiopY.1 # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 
@@ -146,7 +146,7 @@ spring:
     admin:
       # Spring Boot Admin Client 客户端的相关配置
       client:
-        url: http://47.107.28.221:${server.port}/${spring.boot.admin.co ntext-path} # 设置 Spring Boot Admin Server 地址
+        url: http://47.107.29.61:${server.port}/${spring.boot.admin.co ntext-path} # 设置 Spring Boot Admin Server 地址
         instance:
           service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
       # Spring Boot Admin Server 服务端的相关配置
@@ -220,8 +220,8 @@ feifan:
       - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
       - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
   pay:
-    order-notify-url: http://zxgz.newfeifan.cn/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
-    refund-notify-url: http://zxgz.newfeifan.cn/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
+    order-notify-url: https://hk.letcgo.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
+    refund-notify-url: https://hk.letcgo.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
   access-log: # 访问日志的配置项
     enable: false
   error-code: # 错误码相关配置项

feifan-server/src/main/resources/application.yaml

@@ -3,7 +3,7 @@ spring:
     name: feifan-server
 
   profiles:
-    active: local
+    active: prod
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。