|
|
@@ -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));
|
|
|
+ }
|
|
|
}
|