修改合同接口

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/ContractController.java

@@ -57,12 +57,11 @@ public class ContractController implements BusinessControllerMarker {
         return success(contractViewRespVO);
     }
 
-    // TODO
     @PutMapping("update")
     @Operation(summary = "修改合同")
     @PreAuthorize("@ss.hasPermission('system:contract:update')")
     public CommonResult<Boolean> update(@Valid @RequestBody ContractSaveReqVO reqVO) {
-        return success(true);
+        return success(contractService.update(reqVO));
     }
 
     // TODO

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractFormulaSaveReqVO.java

@@ -33,7 +33,7 @@ public class ContractFormulaSaveReqVO {
     private String materialNumber;
 
     @Schema(description = "计算小数位")
-    private Long decimalBit;
+    private Long decimalPoint;
 
     @Schema(description = "金属元素编码")
     private String elementNumber;
@@ -44,6 +44,9 @@ public class ContractFormulaSaveReqVO {
     @Schema(description = "金属元素名称", example = "金属元素名称")
     private String elementName;
 
+    @Schema(description = "结算类型，多条使用逗号分隔（字典：PRCH_STLM_TP）", example = "LST")
+    private String settlementType;
+
     // 基础系数配置
     private List<ContractCoefficientSaveReqVO> coefficients;
     // 品位等级价配置

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractPriceSaveReqVO.java

@@ -49,5 +49,5 @@ public class ContractPriceSaveReqVO {
     private String averageType;
 
     @Schema(description = "网价小数位")
-    private BigDecimal decimalBit;
+    private BigDecimal decimalPoint;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 public class ContractSaveReqVO {
 
-    @Schema(description = "主键")
+    @Schema(description = "主键，新增时为空，修改时需要有值")
     @ExcelProperty("主键")
     private Long id;
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewFormulaRespVO.java

@@ -30,7 +30,7 @@ public class ContractViewFormulaRespVO {
     private String materialNumber;
 
     @Schema(description = "计算小数位")
-    private Long decimalBit;
+    private Long decimalPoint;
 
     @Schema(description = "金属元素编码")
     private String elementNumber;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractViewPriceRespVO.java

@@ -49,5 +49,5 @@ public class ContractViewPriceRespVO {
     private String averageType;
 
     @Schema(description = "网价小数位")
-    private BigDecimal decimalBit;
+    private BigDecimal decimalPoint;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractFormulaDO.java

@@ -60,8 +60,8 @@ public class ContractFormulaDO extends BusinessBaseDO {
     /**
      * 计算小数位
      */
-    @TableField("DEC")
-    private Long decimalBit;
+    @TableField("DEC_PNT")
+    private Long decimalPoint;
     /**
      * 金属元素编码
      */
@@ -77,4 +77,9 @@ public class ContractFormulaDO extends BusinessBaseDO {
      */
     @TableField("ELEM_NAME")
     private String elementName;
+    /**
+     * 结算类型，多条使用逗号分隔（字典：PRCH_STLM_TP）
+     */
+    @TableField("STLM_TP")
+    private String settlementType;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractPriceDO.java

@@ -93,6 +93,6 @@ public class ContractPriceDO extends BusinessBaseDO {
     /**
      * 网价小数位
      */
-    @TableField("DEC")
-    private BigDecimal decimalBit;
+    @TableField("DEC_PNT")
+    private BigDecimal decimalPoint;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java

@@ -25,7 +25,7 @@ public interface ContractService {
     /**
      * 新增合同
      *
-     * @param reqVO 用户信息
+     * @param reqVO 合同信息
      * @return 合同ID
      */
     Long createContract(@Valid ContractSaveReqVO reqVO);
@@ -37,4 +37,12 @@ public interface ContractService {
      * @return 合同信息
      */
     ContractViewRespVO get(Long id);
+
+    /**
+     * 修改合同
+     *
+     * @param reqVO 合同信息
+     * @return 修改结果
+     */
+    Boolean update(@Valid ContractSaveReqVO reqVO);
 }