修改结算单

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

@@ -1,6 +1,5 @@
 package cn.newfeifan.mall.module.distri.controller.admin.integraltopuplog.vo;
 
-import cn.newfeifan.mall.module.system.api.sms.dto.code.SmsCodeUseReqDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import javax.validation.constraints.*;
@@ -30,7 +29,4 @@ public class IntegralTopUpLogSaveReqVO {
     @NotNull(message = "用户名不能为空")
     private String userName;
 
-    @Schema(description = "短信验证码 DTO")
-    private SmsCodeUseReqDTO smsCodeUseReqDTO;
-
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/integraltransferlog/IntegralTransferLogController.java

@@ -9,21 +9,10 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
 import javax.validation.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
-
-import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
-
-import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
-import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
-
 import cn.newfeifan.mall.module.distri.controller.admin.integraltransferlog.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integraltransferlog.IntegralTransferLogDO;
 import cn.newfeifan.mall.module.distri.service.integraltransferlog.IntegralTransferLogService;
@@ -37,30 +26,6 @@ public class IntegralTransferLogController {
     @Resource
     private IntegralTransferLogService integralTransferLogService;
 
-    @PostMapping("/create")
-    @Operation(summary = "创建消费分转让记录")
-    @PreAuthorize("@ss.hasPermission('distri:consumption-transfer-log:create')")
-    public CommonResult<Long> createConsumptionTransferLog(@Valid @RequestBody IntegralTransferLogSaveReqVO createReqVO) {
-        return success(integralTransferLogService.createConsumptionTransferLog(createReqVO));
-    }
-
-    @PutMapping("/update")
-    @Operation(summary = "更新消费分转让记录")
-    @PreAuthorize("@ss.hasPermission('distri:consumption-transfer-log:update')")
-    public CommonResult<Boolean> updateConsumptionTransferLog(@Valid @RequestBody IntegralTransferLogSaveReqVO updateReqVO) {
-        integralTransferLogService.updateConsumptionTransferLog(updateReqVO);
-        return success(true);
-    }
-
-    @DeleteMapping("/delete")
-    @Operation(summary = "删除消费分转让记录")
-    @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('distri:consumption-transfer-log:delete')")
-    public CommonResult<Boolean> deleteConsumptionTransferLog(@RequestParam("id") Long id) {
-        integralTransferLogService.deleteConsumptionTransferLog(id);
-        return success(true);
-    }
-
     @GetMapping("/get")
     @Operation(summary = "获得消费分转让记录")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -78,17 +43,4 @@ public class IntegralTransferLogController {
         return success(BeanUtils.toBean(pageResult, IntegralTransferLogRespVO.class));
     }
 
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出消费分转让记录 Excel")
-    @PreAuthorize("@ss.hasPermission('distri:consumption-transfer-log:export')")
-    @OperateLog(type = EXPORT)
-    public void exportConsumptionTransferLogExcel(@Valid IntegralTransferLogPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<IntegralTransferLogDO> list = integralTransferLogService.getConsumptionTransferLogPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "消费分转让记录.xls", "数据", IntegralTransferLogRespVO.class,
-                        BeanUtils.toBean(list, IntegralTransferLogRespVO.class));
-    }
-
 }

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

@@ -50,4 +50,6 @@ public class IntegralTransferLogRespVO {
     @ExcelProperty("变动后消费分（余额）")
     private Long afterRecipientConsumptionPoints;
 
+    @Schema(description = "积分类型")
+    private Integer integralType;
 }

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

@@ -24,6 +24,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

@@ -27,6 +27,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

@@ -30,6 +30,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

@@ -38,6 +38,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/integraltransferlog/IntegralTransferLogDO.java

@@ -57,4 +57,9 @@ public class IntegralTransferLogDO extends BaseDO {
      */
     private Long afterRecipientConsumptionPoints;
 
+    /**
+     * 积分类型
+     */
+    private Integer integralType;
+
 }

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

@@ -37,6 +37,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

@@ -45,6 +45,10 @@ public class ShopSettlementDO extends BaseDO {
      * 共计成本价格(高精度 + 成本)
      */
     private BigDecimal shopTotalHighAmount;
+    /**
+     * 已计算成本价
+     */
+    private Long settlementAmount;
     /**
      * 平台结算ID
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/dailybill/dto/OrderItemDTO.java

@@ -3,7 +3,7 @@ package cn.newfeifan.mall.module.distri.service.dailybill.dto;
 
 import lombok.Data;
 
-import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class OrderItemDTO {
@@ -55,21 +55,6 @@ public class OrderItemDTO {
      */
     private Long payIntegral;
 
-    /**
-     * 消费分
-     */
-    private Long payConsumptionPoints;
-
-    /**
-     * 实付人民币，单位：分
-     */
-    private Integer payRmb;
-
-    /**
-     * 高精度价格
-     */
-    private BigDecimal highPrecisionPrice;
-
     /**
      * 推广费, 单位: 分
      */
@@ -83,8 +68,9 @@ public class OrderItemDTO {
      * 结算价，单位： 分
      */
     private Integer settlementPrice;
+
     /**
-     * 高精度结算价
+     * 是否结算成本价
      */
-    private BigDecimal highPrecisionSettlementPrice;
+    private LocalDateTime settlementTime;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/integraltopuplog/IntegralTopUpLogServiceImpl.java

@@ -11,11 +11,6 @@ import cn.newfeifan.mall.module.distri.enums.IntegralTypeEnum;
 import cn.newfeifan.mall.module.distri.service.integralchangelog.IntegralChangeLogService;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.orderpercentage.OrderPercentageService;
-import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
-import cn.newfeifan.mall.module.member.service.user.MemberUserService;
-import cn.newfeifan.mall.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
-import cn.newfeifan.mall.module.system.enums.sms.SmsSceneEnum;
-import cn.newfeifan.mall.module.system.service.sms.SmsCodeService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -33,7 +28,6 @@ import cn.newfeifan.mall.module.distri.dal.mysql.consumptiontopuplog.Consumption
 import java.util.List;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.newfeifan.mall.framework.common.util.servlet.ServletUtils.getClientIP;
 import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
 
@@ -58,21 +52,13 @@ public class IntegralTopUpLogServiceImpl implements IntegralTopUpLogService {
     @Resource
     private IntegralChangeLogService integralChangeLogService;
 
-    @Resource
-    private SmsCodeService smsCodeService;
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createConsumptionTopUpLog(IntegralTopUpLogSaveReqVO createReqVO) {
-        // 充值的额度
-        Long agentQuota = createReqVO.getIntegralPoints();
         OrderPercentageDO orderPercentageDO = orderPercentageService.queryStatus();
         // 充值额度校验
         quotaVerify(createReqVO.getUserId(), createReqVO.getIntegralPoints(), orderPercentageDO);
 
-        // 短信验证码校验
-        smsCodeService.useSmsCode(createReqVO.getSmsCodeUseReqDTO().setUsedIp(getClientIP()));
-
         // 额度放大百万倍,存储需要(方便换算),和积分一样
         createReqVO.setIntegralPoints(createReqVO.getIntegralPoints() * DistriConstants.MILLION);
 
@@ -83,7 +69,6 @@ public class IntegralTopUpLogServiceImpl implements IntegralTopUpLogService {
             createReqVO.setPracticalIntegralPoints(createReqVO.getIntegralPoints());
         }
 
-
         // 插入
         IntegralTopUpLogDO consumptionTopUpLog = BeanUtils.toBean(createReqVO, IntegralTopUpLogDO.class);
         consumptionTopUpLogMapper.insert(consumptionTopUpLog);

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ordercalc/OrderCalcServiceImpl.java

@@ -5,7 +5,6 @@ import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.IntegralSaveReqVO;
 import cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo.PtProfitSaveReqVO;
 import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo.PtProfitLogSaveReqVO;
-import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlogdetails.vo.PtProfitLogDetailsSaveReqVO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage.OrderPercentageDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofit.PtProfitDO;
@@ -202,7 +201,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             dailyBillService.caleDailyBill();
 
             // 结算订单，签收七天的订单
-//            shopSettlementService.settlementOrder();
+            shopSettlementService.settlementOrder();
 
             // 每日消费分校对预警
 //            consumptionErrorLogService.calcEveryDayConsumptionPointsErrorLog();

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/shopsettlement/ShopSettlementServiceImpl.java

@@ -170,11 +170,11 @@ public class ShopSettlementServiceImpl implements ShopSettlementService {
         Map<Long, List<Long>> shopOrderItemIds = new HashMap<>();
         List<ShopSettlementDO> shopSettlementDOS = new ArrayList<>();
 
+        // pt结算成本价
+        Long ptSettlementAmount = 0L;
         Integer ptPlatformCollectionAmount = 0;
         // 代收积分
         Long ptPayIntegral = 0L;
-        // 代收消费分
-        Long ptPayConsumptionPoints = 0L;
         // 店铺应得金额（成本 * 数量）
         int ptShopAmount = 0;
         BigDecimal ptShopHighAmount = BigDecimal.ZERO;
@@ -196,13 +196,14 @@ public class ShopSettlementServiceImpl implements ShopSettlementService {
                 Integer platformCollectionAmount = 0;
                 // 代收积分
                 Long payIntegral = 0L;
-                // 代收消费分
-                Long payConsumptionPoints = 0L;
 
                 // 店铺应得金额（成本 * 数量）
                 int shopAmount = 0;
                 BigDecimal shopHighAmount = BigDecimal.ZERO;
 
+                // 结算成本价
+                Long settlementAmount = 0L;
+
                 //获取该店铺下的订单
                 for (OrderDTO order : orders) {
                     // 获取所有的订单id
@@ -214,32 +215,26 @@ public class ShopSettlementServiceImpl implements ShopSettlementService {
                     for (OrderItemDTO item : order.getItems()) {
                         //拿到该店铺下的所有订单项id
                         orderItemIds.add(item.getId());
-                        //计算订单的收入金额(pt)
-                        platformCollectionAmount += item.getPayRmb();
-                        ptPlatformCollectionAmount += item.getPayRmb();
                         //计算订单的收入积分（pt）
                         payIntegral += item.getPayIntegral();
-                        payConsumptionPoints += item.getPayConsumptionPoints();     //消费分
                         ptPayIntegral += item.getPayIntegral();
-                        ptPayConsumptionPoints += item.getPayConsumptionPoints();   //消费分
                         // 商品的成本价（成本 * 数量）
                         shopAmount += item.getSettlementPrice() * item.getCount();
                         ptShopAmount += item.getSettlementPrice() * item.getCount();
-                        // 商品的高精度成本价（成本 * 数量）
-                        shopHighAmount = shopHighAmount.add(BigDecimal.valueOf(item.getHighPrecisionSettlementPrice().doubleValue() * item.getCount()));
-                        ptShopHighAmount = ptShopHighAmount.add(BigDecimal.valueOf(item.getHighPrecisionSettlementPrice().doubleValue() * item.getCount()));
 
                         // 如果商品成本不为0，则计算利润
-                        if(!item.getSettlementPrice().equals(0)){
+                        if (!item.getSettlementPrice().equals(0)) {
                             profit = profit.add(BigDecimal.valueOf(item.getCostPrice() - item.getSettlementPrice()));
-                        } else if(item.getHighPrecisionSettlementPrice().compareTo(new BigDecimal("0")) == 0){
-                            // 商品的高精度成本价
-                            profit = profit.add(item.getHighPrecisionPrice().subtract(item.getHighPrecisionSettlementPrice()));
+                        }
+
+                        if (item.getSettlementTime() != null) {
+                            settlementAmount += item.getSettlementPrice();
+                            ptSettlementAmount += item.getSettlementPrice();
                         }
                     }
 
                     // 订单利润大于0的时候才操作
-                    if(profit.compareTo(BigDecimal.ZERO) > 0){
+                    if (profit.compareTo(BigDecimal.ZERO) > 0) {
                         PtProfitDO ptProfit = ptProfitService.getPtProfit();
 
                         // 金额转积分 放大一万倍
@@ -269,7 +264,6 @@ public class ShopSettlementServiceImpl implements ShopSettlementService {
                   积分要转换才能变为钱
                  */
                 platformCollectionAmount += integral2Money(payIntegral);
-                platformCollectionAmount += integral2Money(payConsumptionPoints);
 
 
                 // 店铺共计成本金额
@@ -281,17 +275,16 @@ public class ShopSettlementServiceImpl implements ShopSettlementService {
                         .merchantId(merchant.getMerchantId())
                         .platformCollectionAmount(platformCollectionAmount)
                         .shopAmount(payIntegral)
-                        .shopConsumptionPoints(payConsumptionPoints)
                         .shopTotalHighAmount(totalHighAmount.setScale(6, RoundingMode.HALF_UP))
                         .accountName(shop.getAccountName())
                         .accountNumber(shop.getAccountNumber())
+                        .settlementAmount(settlementAmount)
                         .build();
                 shopSettlementDOS.add(shopSett);
             }
         }
 
         ptPlatformCollectionAmount += integral2Money(ptPayIntegral);
-        ptPlatformCollectionAmount += integral2Money(ptPayConsumptionPoints);
         // 平台共计成本金额
         BigDecimal totalHighAmount = ptShopHighAmount.add(BigDecimal.valueOf(ptShopAmount));
 
@@ -299,8 +292,8 @@ public class ShopSettlementServiceImpl implements ShopSettlementService {
         PtSettlementDO ptSettlementDO = PtSettlementDO.builder()
                 .platformCollectionAmount(ptPlatformCollectionAmount)
                 .shopAmount(ptPayIntegral)
-                .consumptionPoints(ptPayConsumptionPoints)
                 .shopTotalHighAmount(totalHighAmount.setScale(6, RoundingMode.HALF_UP))
+                .settlementAmount(ptSettlementAmount)
                 .build();
         ptSettlementMapper.insert(ptSettlementDO);
 

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/shopsettlement/ShopSettlementMapper.xml

@@ -16,7 +16,7 @@
     </resultMap>
     <update id="setOrderItemById">
         update trade_order_item
-        set settlement_time = now()
+        set is_settlement = 1
         where id in
             <foreach item="ids" collection="ids" open="(" separator="," close=")">
                 #{ids}
@@ -39,16 +39,16 @@
         and o.deleted = 0
         and o.shop_id = #{shopId}
         and o.merchant_id = #{merchantId}
-        and date(o.create_time) <![CDATA[ <= ]]> DATE_SUB(now(),INTERVAL 7 DAY)
-        and item.settlement_time is null
+--         and date(o.create_time) <![CDATA[ <= ]]> DATE_SUB(now(),INTERVAL 7 DAY)
+        and item.is_settlement = 0
         and item.after_sale_status = 0
     </select>
 
     <select id="getOrderItem" resultType="cn.newfeifan.mall.module.distri.service.dailybill.dto.OrderItemDTO">
-        select id,order_id,count,price,delivery_price,pay_price,high_precision_price,promotion_fee,cost_price,pay_integral,pay_rmb,
-               settlement_price,high_precision_settlement_price,pay_consumption_points from trade_order_item
+        select id,order_id,count,price,delivery_price,promotion_fee,cost_price,pay_integral,
+               settlement_price,settlement_time from trade_order_item
         where deleted = 0
-          and settlement_time is null
+          and is_settlement = 0
           and after_sale_status = 0
           and order_id = #{id}
     </select>

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

@@ -116,6 +116,14 @@ public class TradeOrderController {
         PageResult<TradeOrderPageItemRespVO> data = TradeOrderConvert.INSTANCE.convertPage(pageResult, orderItems, userMap);
         for (TradeOrderPageItemRespVO tradeOrderPageItemRespVO : data.getList()) {
             tradeOrderPageItemRespVO.setSpuType(tradeOrderQueryService.getSpuType(orderItems));
+            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

@@ -127,4 +127,9 @@ 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 文档生成
@@ -66,4 +68,10 @@ public class TradeOrderItemBaseVO {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+
+    @Schema(description = "结算时间")
+    private LocalDateTime settlementTime;
+
+    @Schema(description = "结算价")
+    private Long settlementPrice;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderItemDO.java

@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -138,6 +138,18 @@ public class TradeOrderItemDO extends BaseDO {
      */
     private Long payIntegral;
 
+    /**
+     * 是否结算
+     */
+    private Boolean isSettlement;
+
+    private LocalDateTime settlementTime;
+
+    /**
+     * 结算价格，单位：分
+     */
+    private Long settlementPrice;
+
     /**
      * 商品属性
      */

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/merchant/vo/MerchantSaveReqVO.java

@@ -85,6 +85,9 @@ public class MerchantSaveReqVO {
     @Schema(description = "商户申请id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25541")
     private Long merchantApplyId;
 
+    @Schema(description = "申请会员用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "25541")
+    private Long applyMemberUserId;
+
     @Schema(description = "品牌授权书", requiredMode = Schema.RequiredMode.REQUIRED)
     private String brandLicensing;
 

feifan-module-system/feifan-module-system-api/src/main/java/cn/newfeifan/mall/module/system/enums/DictTypeConstants.java

@@ -27,7 +27,7 @@ public interface DictTypeConstants {
     String SMS_RECEIVE_STATUS = "system_sms_receive_status"; // 短信接收状态
 
     //默认头像
-    String DEFAULT_AVATAR = "https://pt.letcgo.com/admin-api/infra/file/23/get/f9deb6a0e38c17d3d416da8b5285412dee1360e53e5b094f9397094be4252e66.png";
+    String DEFAULT_AVATAR = "https://hkpt.letcgo.com/admin-api/infra/file/23/get/f9deb6a0e38c17d3d416da8b5285412dee1360e53e5b094f9397094be4252e66.png";
 
 
 }