Ver Fonte

feat:修改代收金额

caoliqin há 2 dias atrás
pai
commit
443e3d7711

+ 13 - 0
fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -49,6 +49,7 @@ import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsStoreOrderStatusScrm;
 import com.fs.hisStore.domain.FsStorePaymentScrm;
 import com.fs.his.dto.ExpressInfoDTO;
+import com.fs.hisStore.dto.FsStoreOrderPayDeliveryDTO;
 import com.fs.hisStore.dto.StoreOrderExpressExportDTO;
 import com.fs.hisStore.dto.StoreOrderProductDTO;
 import com.fs.hisStore.enums.ShipperCodeEnum;
@@ -1166,6 +1167,18 @@ public class FsStoreOrderScrmController extends BaseController {
         return fsStoreOrderService.orderRemark(param);
     }
 
+    /**
+     * 修改订单的代收金额
+     */
+    @PreAuthorize("@ss.hasPermi('store:storeOrder:editPayDelivery')")
+    @Log(title = "订单-修改代收金额", businessType = BusinessType.UPDATE)
+    @PutMapping("/editPayDelivery")
+    public AjaxResult editPayDelivery(@RequestBody FsStoreOrderPayDeliveryDTO fsStoreOrderPayDeliveryDTO) {
+        FsStoreOrderScrm fsStoreOrderScrm = new FsStoreOrderScrm();
+        BeanUtils.copyProperties(fsStoreOrderPayDeliveryDTO, fsStoreOrderScrm);
+        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrderScrm));
+    }
+
     private FsStoreOrderDf getDFInfo(String loginAccount) {
         //查询订单账户 判断是否存在该订单账户
         List<FsDfAccount> erpAccounts = fsDfAccountService.selectFsDfAccountList(null);

+ 14 - 0
fs-company/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -30,6 +30,7 @@ import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsStoreOrderStatusScrm;
 import com.fs.hisStore.domain.FsStorePaymentScrm;
 import com.fs.hisStore.dto.ExpressInfoDTO;
+import com.fs.hisStore.dto.FsStoreOrderPayDeliveryDTO;
 import com.fs.hisStore.dto.StoreOrderProductDTO;
 import com.fs.hisStore.enums.OrderLogEnum;
 import com.fs.hisStore.enums.ShipperCodeEnum;
@@ -38,6 +39,7 @@ import com.fs.hisStore.service.*;
 import com.fs.hisStore.vo.*;
 import com.fs.system.service.ISysConfigService;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -520,4 +522,16 @@ public class FsStoreOrderScrmController extends BaseController
     public AjaxResult updateStoreOrderItemJson(@PathVariable("orderId") Long orderId,@PathVariable("backendEditProductType") Integer backendEditProductType) {
         return toAjax(fsStoreOrderService.updateStoreOrderItemJson(orderId,backendEditProductType));
     }
+
+    /**
+     * 修改订单的代收金额
+     */
+    @PreAuthorize("@ss.hasPermi('store:storeOrder:editPayDelivery')")
+    @Log(title = "订单-修改代收金额", businessType = BusinessType.UPDATE)
+    @PutMapping("/editPayDelivery")
+    public AjaxResult editPayDelivery(@RequestBody FsStoreOrderPayDeliveryDTO fsStoreOrderPayDeliveryDTO) {
+        FsStoreOrderScrm fsStoreOrderScrm = new FsStoreOrderScrm();
+        BeanUtils.copyProperties(fsStoreOrderPayDeliveryDTO, fsStoreOrderScrm);
+        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrderScrm));
+    }
 }

+ 24 - 0
fs-service/src/main/java/com/fs/hisStore/dto/FsStoreOrderPayDeliveryDTO.java

@@ -0,0 +1,24 @@
+package com.fs.hisStore.dto;
+
+import lombok.Data;
+import java.math.BigDecimal;
+
+/**
+ * 商城订单代收金额对象 FsStoreOrderPayDeliveryDTO
+ *
+ * @author caoliqin
+ * @date 2026-01-17
+ */
+@Data
+public class FsStoreOrderPayDeliveryDTO
+{
+    /** 订单ID */
+    private Long id;
+
+    /** 订单号 */
+    private String orderCode;
+
+    /** 物流代收金额 */
+    private BigDecimal payDelivery;
+
+}