承运端货主结算单修改

performance-api/src/main/java/com/clx/performance/param/pc/owner/SaveExpressParam.java

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SaveExpressParam extends PageParam {
+
+    @ApiModelProperty(value = "结算编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "快递公司", example = "顺风")
+    private String expressCompany;
+
+    @ApiModelProperty(value = "快递编号", example = "SF145787")
+    private String expressNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/owner/SavePayeeParam.java

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class SavePayeeParam extends PageParam {
+
+    @ApiModelProperty(value = "结算编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value = "收款人", example = "收款人")
+    private String payee;
+
+    @ApiModelProperty(value = "收款银行", example = "浙江银行")
+    private String payeeBankName;
+
+    @ApiModelProperty(value = "收款银行卡卡号", example = "62213545878787")
+    private String payeeBankCardNo;
+
+    @ApiModelProperty(value = "付款凭证", example = "/a.png")
+    private String paymentImg;
+
+    @ApiModelProperty(value = "付款银行", example = "浙江银行")
+    private String paymentBankName;
+
+    @ApiModelProperty(value = "付款银行卡卡号", example = "62213545878787")
+    private String paymentBankCardNo;
+
+    @ApiModelProperty(value = "付款金额", example = "123")
+    private String paymentAmount;
+
+}

performance-api/src/main/java/com/clx/performance/param/pc/owner/UploadInvoiceImgParam.java

+package com.clx.performance.param.pc.owner;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UploadInvoiceImgParam extends PageParam {
+
+    @ApiModelProperty(value = "结算编号", example = "JS415")
+    private String settlementNo;
+
+    @ApiModelProperty(value="结算凭证",example = "/123.img")
+    private String invoiceImg;
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierSettlementOwnerController.java

@@ -2,6 +2,9 @@ package com.clx.performance.controller.pc.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
+import com.clx.performance.param.pc.owner.SaveExpressParam;
+import com.clx.performance.param.pc.owner.SavePayeeParam;
+import com.clx.performance.param.pc.owner.UploadInvoiceImgParam;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.vo.pc.carrier.settle.*;
 import com.msl.common.base.PageData;
@@ -85,4 +88,27 @@ public class CarrierSettlementOwnerController {
         return Result.ok(settlementOwnerService.getCarrierSettlementOwnerExpress(id));
     }
 
+    @ApiOperation(value = "货主结算单上传结算凭证",notes = "<br>By:姜文业")
+    @PostMapping("/uploadInvoiceImg")
+    public Result uploadInvoiceImg(@RequestBody @Validated UploadInvoiceImgParam param) {
+        settlementOwnerService.uploadInvoiceImg(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主结算单填写快递信息",notes = "<br>By:姜文业")
+    @PostMapping("/saveExpress")
+    public Result saveExpress(@RequestBody @Validated SaveExpressParam param) {
+        settlementOwnerService.saveExpress(param);
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "货主结算单付款确认",notes = "<br>By:姜文业")
+    @PostMapping("/savePayee")
+    public Result savePayee(@RequestBody @Validated SavePayeeParam param) {
+        settlementOwnerService.savePayee(param);
+        return Result.ok();
+    }
+
+
+
 }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -121,4 +121,42 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
     public List<SettlementOwner> listToBeLockOfSettlementPeriodMonth(LocalDateTime settlementPeriodTime) {
         return null;
     }
+
+    @Override
+    public boolean uploadInvoiceImg(String settlementNo, String invoiceImg) {
+        return update(lUdWrapper()
+                .eq(SettlementOwner::getSettlementNo, settlementNo)
+                .set(SettlementOwner::getInvoiceImg, invoiceImg)
+        );
+    }
+
+    @Override
+    public boolean saveExpress(String settlementNo, String expressCompany, String expressNo){
+        return update(lUdWrapper()
+                .eq(SettlementOwner::getSettlementNo, settlementNo)
+                .set(SettlementOwner::getExpressCompany, expressCompany)
+                .set(SettlementOwner::getExpressNo, expressNo)
+        );
+    }
+
+    @Override
+    public boolean savePayee(String settlementNo,
+                               String payee,
+                               String payeeBankName,
+                               String payeeBankCardNo,
+                               String paymentImg,
+                               String paymentBankCardNo,
+                               String paymentBankName,
+                               String paymentAmount){
+        return update(lUdWrapper()
+                .eq(SettlementOwner::getSettlementNo, settlementNo)
+                .set(SettlementOwner::getPayee, payee)
+                .set(SettlementOwner::getPayeeBankName, payeeBankName)
+                .set(SettlementOwner::getPayeeBankCardNo, payeeBankCardNo)
+                .set(SettlementOwner::getPaymentImg, paymentImg)
+                .set(SettlementOwner::getPaymentBankCardNo, paymentBankCardNo)
+                .set(SettlementOwner::getPaymentBankName, paymentBankName)
+                .set(SettlementOwner::getPaymentAmount, paymentAmount)
+        );
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java

@@ -37,4 +37,18 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
                                                                       @Param("invoiceType")Integer invoiceType);
     List<SettlementOwner> listToBeLockOfSettlementPeriodMonth(@Param("settlementPeriodTime") LocalDateTime settlementPeriodTime);
 
+    boolean uploadInvoiceImg(@Param("settlementNo")String settlementNo, @Param("invoiceImg")String invoiceImg);
+
+    boolean saveExpress(@Param("settlementNo")String settlementNo, @Param("expressCompany")String expressCompany, @Param("expressNo")String expressNo);
+
+    boolean savePayee(@Param("settlementNo")String settlementNo,
+                        @Param("payee")String payee,
+                        @Param("payeeBankName")String payeeBankName,
+                        @Param("payeeBankCardNo")String payeeBankCardNo,
+                        @Param("paymentImg")String paymentImg,
+                        @Param("paymentBankCardNo")String paymentBankCardNo,
+                        @Param("paymentBankName")String paymentBankName,
+                        @Param("paymentAmount")String paymentAmount);
+
+
 }

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwner.java

@@ -49,6 +49,7 @@ public class SettlementOwner implements HasKey<Integer> {
     private String paymentImg;                      //付款凭证
     private String paymentBankName;                   //付款银行
     private String paymentBankCardNo;                //付款银行卡卡号
+    private String paymentAmount;                //付款金额
     private String companyName;                     //公司名称
     private String companyTaxCode;                  //企业税号
     private String companyAddress;                  //公司地址
@@ -74,4 +75,4 @@ public class SettlementOwner implements HasKey<Integer> {
     public Integer gainKey() {
         return id;
     }
-}
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -12,9 +12,7 @@ import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementPlatformAccount;
-import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
-import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
+import com.clx.performance.param.pc.owner.*;
 import com.clx.performance.service.OwnerAccountService;
 import com.clx.performance.service.settle.SettlementLogService;
 import com.clx.performance.service.settle.SettlementOwnerService;
@@ -292,5 +290,26 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         CarrierSettlementOwnerExpressVO detail = settlementOwnerStruct.convertToExpress(settlementOwner);
         return detail;
     }
+    @Override
+    public void uploadInvoiceImg(UploadInvoiceImgParam param){
+        settlementOwnerDao.uploadInvoiceImg(param.getSettlementNo(),param.getInvoiceImg());
+    }
+
+    @Override
+    public void saveExpress(SaveExpressParam param){
+        settlementOwnerDao.saveExpress(param.getSettlementNo(),param.getExpressCompany(),param.getExpressNo());
+    }
+
+    @Override
+    public void savePayee(SavePayeeParam param){
+        settlementOwnerDao.savePayee(param.getSettlementNo(),
+                param.getPayee(),
+                param.getPayeeBankName(),
+                param.getPayeeBankCardNo(),
+                param.getPaymentImg(),
+                param.getPaymentBankCardNo(),
+                param.getPaymentBankName(),
+                param.getPaymentAmount());
+    }
 
 }

performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java

 package com.clx.performance.service.settle;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.param.pc.owner.OwnerPaymentSettlementParam;
-import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
-import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
+import com.clx.performance.param.pc.owner.*;
 import com.clx.performance.vo.pc.carrier.settle.*;
 import com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO;
 import com.clx.performance.vo.pc.owner.settle.SettlementPlatformAccountVO;
@@ -42,5 +40,11 @@ public interface SettlementOwnerService {
 
     CarrierSettlementOwnerExpressVO getCarrierSettlementOwnerExpress(Integer id);
 
+    void uploadInvoiceImg(UploadInvoiceImgParam param);
+
+    void saveExpress(SaveExpressParam param);
+
+    void savePayee(SavePayeeParam param);
+
 
 }