Merge branch 'order_fee_update' into release

sql/v2.2/20241126.sql

+-- 新增费用申请记录的付款人属性
+alter table ecw_order_fee_application
+    add COLUMN  `payer` tinyint DEFAULT NULL COMMENT '付款人' after `pay_type`;
+
+update ecw_order_fee_application f left join ecw_receivable r on f.receivable_id = r.id set f.payer = r.payment_user;
\ No newline at end of file

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/orderFeeApplication/OrderFeeApplicationDO.java

@@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.order.dal.dataobject.orderFeeApplication;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@@ -38,7 +40,7 @@ public class OrderFeeApplicationDO extends BaseDO {
     /**
      * 费用申请金额
      */
-    private java.math.BigDecimal applicationFee;
+    private BigDecimal applicationFee;
     /**
      * 费用申请货币类型
      *
@@ -50,6 +52,12 @@ public class OrderFeeApplicationDO extends BaseDO {
      * 枚举 {@link TODO pay_type 对应的类}
      */
     private Integer payType;
+    /**
+     * 付款人
+     *
+     * 1 发货人 2 收货人
+     */
+    private Integer payer;
     /**
      * 备注
      */

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderQueryServiceImpl.java

@@ -320,10 +320,10 @@ public class OrderQueryServiceImpl implements OrderQueryService {
             }
             vo = new OrderSpecialApplyVO();
             BeanUtils.copyProperties(orderItemDO, vo);
-
-
+            vo.setOrgCharging(vo.getCharging());
             vo.setOrgFreight(orderItemDO.getOneSeaFreight());
             vo.setSubtotalFreight(orderItemDO.getSeaFreight());
+            vo.setOrgFreightCurrency(Long.valueOf(orderItemDO.getSeaFreightCurrency()));
             vo.setFreightCurrency(Long.valueOf(orderItemDO.getSeaFreightCurrency()));
             vo.setFreightVolume(orderItemDO.getSeaFreightVolume());
 
@@ -331,6 +331,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                 vo.setClearanceFreight(null); // 因字段冲突，copy后需要将该字段置空
                 vo.setOrgClearanceFreight(orderItemDO.getOneClearanceFreight());
                 vo.setSubtotalClearanceFreight(orderItemDO.getClearanceFreight());
+                vo.setOrgClearanceFreightCurrency(Long.valueOf(orderItemDO.getClearanceFreightCurrency()));
                 vo.setClearanceFreightCurrency(Long.valueOf(orderItemDO.getClearanceFreightCurrency()));
                 vo.setClearanceFreightVolume(orderItemDO.getClearanceFreightVolume());
             }
@@ -426,8 +427,11 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                 OrderSpecialBatchApplyOrderItemDetailVO vo = new OrderSpecialBatchApplyOrderItemDetailVO();
                 BeanUtils.copyProperties(orderItemDO, vo);
 
+                vo.setOrgCharging(vo.getCharging());
+
                 vo.setOrgFreight(orderItemDO.getOneSeaFreight());
                 vo.setSubtotalFreight(orderItemDO.getSeaFreight());
+                vo.setOrgFreightCurrency(Long.valueOf(orderItemDO.getSeaFreightCurrency()));
                 vo.setFreightCurrency(Long.valueOf(orderItemDO.getSeaFreightCurrency()));
                 vo.setFreightVolume(orderItemDO.getSeaFreightVolume());
 
@@ -435,6 +439,7 @@ public class OrderQueryServiceImpl implements OrderQueryService {
                     vo.setClearanceFreight(null); // 因字段冲突，copy后需要将该字段置空
                     vo.setOrgClearanceFreight(orderItemDO.getOneClearanceFreight());
                     vo.setSubtotalClearanceFreight(orderItemDO.getClearanceFreight());
+                    vo.setOrgClearanceFreightCurrency(Long.valueOf(orderItemDO.getClearanceFreightCurrency()));
                     vo.setClearanceFreightCurrency(Long.valueOf(orderItemDO.getClearanceFreightCurrency()));
                     vo.setClearanceFreightVolume(orderItemDO.getClearanceFreightVolume());
                 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/approval/OrderSpecialApplyVO.java

@@ -53,12 +53,18 @@ public class OrderSpecialApplyVO {
     @ApiModelProperty(value = "原运费(成交单价)")
     private BigDecimal orgFreight = BigDecimal.ZERO;
 
+    @ApiModelProperty(value = "原运费用金额单位ID")
+    private Long orgFreightCurrency = 1L;
+
     @ApiModelProperty(value = "小计清关费")
     private BigDecimal subtotalClearanceFreight = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "原清关费(成交单价)")
     private BigDecimal orgClearanceFreight = BigDecimal.ZERO;
 
+    @ApiModelProperty(value = "原清关费用金额单位ID")
+    private Long orgClearanceFreightCurrency = 1L;
+
     @ApiModelProperty(value = "新运费(成交单价)")
     private BigDecimal freight;
 
@@ -94,6 +100,9 @@ public class OrderSpecialApplyVO {
     @ApiModelProperty(value = "是否预付：0 到付 1 预付")
     private Integer isPayAdvance;
 
+    @ApiModelProperty(value = "原计费方式：0 运费/清关费 1 全包价")
+    private Integer orgCharging = 0;
+
     @ApiModelProperty(value = "计费方式：0 运费/清关费 1 全包价")
     private Integer charging = 0;
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/approval/OrderSpecialBatchApplyOrderItemDetailVO.java

@@ -32,12 +32,18 @@ public class OrderSpecialBatchApplyOrderItemDetailVO {
     @ApiModelProperty(value = "原运费(成交单价)")
     private BigDecimal orgFreight = BigDecimal.ZERO;
 
+    @ApiModelProperty(value = "原运费用金额单位ID")
+    private Long orgFreightCurrency = 1L;
+
     @ApiModelProperty(value = "小计清关费")
     private BigDecimal subtotalClearanceFreight = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "原清关费(成交单价)")
     private BigDecimal orgClearanceFreight = BigDecimal.ZERO;
 
+    @ApiModelProperty(value = "原清关费用金额单位ID")
+    private Long orgClearanceFreightCurrency = 1L;
+
     @ApiModelProperty(value = "新运费(成交单价)")
     private BigDecimal freight;
 
@@ -59,6 +65,9 @@ public class OrderSpecialBatchApplyOrderItemDetailVO {
     @ApiModelProperty(value = "是否预付：0 到付 1 预付")
     private Integer isPayAdvance;
 
+    @ApiModelProperty(value = "原计费方式：0 运费/清关费 1 全包价")
+    private Integer orgCharging = 0;
+
     @ApiModelProperty(value = "计费方式：0 运费/清关费 1 全包价")
     private Integer charging = 0;
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderFeeApplication/OrderFeeApplicationBackVO.java

@@ -45,6 +45,10 @@ public class OrderFeeApplicationBackVO {
     @ApiModelProperty(value = "付款类型", required = true)
     private Integer payType;
 
+    @ApiModelProperty(value = "付款人： 1 发货人 2 收货人", required = true)
+    private Integer payer;
+
+
     @ExcelProperty("备注")
     @ApiModelProperty(value = "备注")
     private String remarks;

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderFeeApplication/OrderFeeApplicationBaseVO.java

 package cn.iocoder.yudao.module.order.vo.orderFeeApplication;
 
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import io.swagger.annotations.*;
 import javax.validation.constraints.*;
@@ -25,7 +27,7 @@ public class OrderFeeApplicationBaseVO {
 
     @ApiModelProperty(value = "费用申请金额", required = true)
     @NotNull(message = "费用申请金额不能为空")
-    private java.math.BigDecimal applicationFee;
+    private BigDecimal applicationFee;
 
     @ApiModelProperty(value = "费用申请货币类型", required = true)
     @NotNull(message = "费用申请货币类型不能为空")
@@ -35,6 +37,9 @@ public class OrderFeeApplicationBaseVO {
     @NotNull(message = "付款类型不能为空")
     private Integer payType;
 
+    @ApiModelProperty(value = "付款人： 1 发货人 2 收货人", required = true)
+    private Integer payer;
+
     @ApiModelProperty(value = "备注")
     private String remarks;
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderFeeApplication/OrderFeeApplicationQueryVO.java

@@ -27,6 +27,9 @@ public class OrderFeeApplicationQueryVO {
     @ApiModelProperty(value = "付款类型")
     private Integer payType;
 
+    @ApiModelProperty(value = "付款人： 1 发货人 2 收货人")
+    private Integer payer;
+
     @ApiModelProperty(value = "备注")
     private String remarks;
 

yudao-module-order/yudao-module-order-rest/src/main/java/cn/iocoder/yudao/module/order/controller/admin/order/OrderController.java

@@ -29,6 +29,7 @@ import cn.iocoder.yudao.module.order.convert.order.OrderConvert;
 import cn.iocoder.yudao.module.order.dal.dataobject.order.OrderDO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderItem.OrderItemDO;
 import cn.iocoder.yudao.module.order.dto.*;
+import cn.iocoder.yudao.module.order.enums.CustomDraweeEnum;
 import cn.iocoder.yudao.module.order.enums.OrderApprovalTypeEnum;
 import cn.iocoder.yudao.module.order.enums.OrderTempLateEnum;
 import cn.iocoder.yudao.module.order.enums.TransportTypeShortEnum;
@@ -867,6 +868,14 @@ public class OrderController {
         return success(statisticsVO);
     }
 
+    @GetMapping("/fee/drawee/{feeType}")
+    @ApiOperation("获取费用自定义付款人定义枚举值")
+    @ApiImplicitParam(name = "feeType", value = "费用类型", required = true,dataTypeClass = Integer.class)
+    public CommonResult<String> getFeeDraweeByFeeType(@PathVariable("feeType") Integer feeType) {
+        CustomDraweeEnum draweeEnum = CustomDraweeEnum.valueOf(feeType);
+        return success(Objects.nonNull(draweeEnum) ? draweeEnum.getKey() : null);
+    }
+
 
     @GetMapping("/approvalTypeCheck")
     @ApiOperation("校验订单审批是否存在互斥类型：是 或 否  ")

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/box/BoxBaseBackVO.java

@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.shipment.enums.BoxApprovalTypeEnum;
 import cn.iocoder.yudao.module.shipment.enums.BoxStatusEnum;
 import cn.iocoder.yudao.module.shipment.enums.TransportTypeEnum;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -82,35 +83,42 @@ public class BoxBaseBackVO {
 
     @ExcelProperty("预装时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "预装时间")
     private Date yzDate;
 
     @ExcelProperty("装柜时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "装柜时间")
     private Date zgDate;
 
     @ExcelProperty("起运时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "起运时间")
     private Date qyDate;
 
     @ExcelProperty("到港时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "到港时间")
     private Date dgDate;
 
     @ExcelProperty("清关时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "清关时间")
     private Date qgDate;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "到仓时间")
     private Date dcDate;
 
     @ExcelProperty("提货时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "提货时间")
     private Date thDate;
 
@@ -126,6 +134,7 @@ public class BoxBaseBackVO {
     private Integer tyStatus;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "提交理货时间")
     private Date tyTime;
 
@@ -260,6 +269,7 @@ public class BoxBaseBackVO {
 
     @ExcelProperty("创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;