楚江ERP：锁价接口开发，部分问题修复

@@ -152,8 +152,8 @@ create table if not exists  `tbl_contract_distributor_line`
     `length_tol_pos`       DECIMAL(10, 4) COMMENT '长度公差正',
     `length_tol_neg`       DECIMAL(10, 4) COMMENT '长度公差负',
     `status`               VARCHAR(50) COMMENT '状态',
-    `quantity`             DECIMAL(15, 4) NOT NULL COMMENT '数量',
-    `unit_price`           DECIMAL(15, 4) NOT NULL COMMENT '单价',
+    `quantity`             DECIMAL(15, 4)  COMMENT '数量',
+    `unit_price`           DECIMAL(15, 4)  COMMENT '单价',
     `amount_excluding_tax` DECIMAL(15, 2) COMMENT '不含税金额',
     `total_amount`         DECIMAL(15, 2) COMMENT '总金额',
     `delivery_date`        DATE COMMENT '发货日期',

@@ -44,6 +44,7 @@ import com.lframework.xingyun.sc.vo.contract.queryVo.QueryContractDistributorSta
 import com.lframework.xingyun.sc.vo.contract.updateVo.UpdateContractDistributorStandardVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -432,6 +433,18 @@ public class ContractDistributorStandardController extends DefaultBaseController
         return InvokeResultBuilder.success(new GetContractDistributorStandardBo(contractDistributorStandard));
     }
 
+    @ApiModelProperty("锁价")
+    @PostMapping("/priceLock")
+    public void priceLock(@RequestBody UpdateContractDistributorStandardVo vo) {
+        if (vo == null || StringUtils.isBlank(vo.getId())) {
+            throw new DefaultClientException("参数错误！");
+        }
+
+        contractDistributorStandardService.stockContractPriceLock(vo);
+
+        contractDistributorStandardService.cleanCacheByKey(vo.getId());
+    }
+
     /**
      * 标准合同模版打印
      */

@@ -22,6 +22,7 @@ import com.lframework.xingyun.basedata.entity.Customer;
 import com.lframework.xingyun.basedata.entity.ProductVariety;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.product.ProductVarietyService;
+import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
 import com.lframework.xingyun.sc.bo.contract.QueryContractFrameworkBo;
 import com.lframework.xingyun.sc.components.code.GenerateCodeTypePool;
 import com.lframework.xingyun.sc.entity.ContractFramework;
@@ -86,6 +87,17 @@ public class ContractFrameworkController extends DefaultBaseController {
     @HasPermission({"contract:contractFramework:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryContractFrameworkBo>> query(@Valid QueryContractFrameworkVo vo) {
+        if(vo != null && StringUtils.isNotBlank(vo.getCustomerName())) {
+            QueryCustomerVo queryCustomerVo = new QueryCustomerVo();
+            queryCustomerVo.setName(vo.getCustomerName());
+            List<Customer> customerList = customerService.query(queryCustomerVo);
+            if(CollectionUtils.isEmpty(customerList)) {
+                PageResult<QueryContractFrameworkBo> boPageResult = new PageResult<>();
+                return InvokeResultBuilder.success(boPageResult);
+            }
+
+            vo.setCustomerIdList(customerList.stream().map(Customer::getId).collect(Collectors.toList()));
+        }
 
         PageResult<ContractFramework> pageResult = contractFrameworkService.query(getPageIndex(vo), getPageSize(vo), vo);
 

 package com.lframework.xingyun.sc.excel.contract;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.utils.DateUtil;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
@@ -58,6 +60,7 @@ public class ContractFrameworkExportModel extends BaseBo<ContractFramework> impl
      * 授信截止日期
      */
     @ExcelProperty("授信截止日期")
+    @DateTimeFormat(StringPool.DATE_PATTERN)
     private Date validityTime;
 
     public ContractFrameworkExportModel() {

@@ -2,12 +2,12 @@ package com.lframework.xingyun.sc.excel.contract;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.annotations.excel.ExcelRequired;
 import com.lframework.starter.web.core.components.excel.ExcelModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
 @Data
@@ -63,6 +63,7 @@ public class ContractFrameworkImportModel implements ExcelModel {
      * 授信截止日期
      */
     @ExcelRequired
+    @DateTimeFormat(StringPool.DATE_PATTERN)
     @ExcelProperty("授信截止日期")
     private Date validityTime;
 

@@ -57,7 +57,7 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         return getBaseMapper().selectById(id);
     }
 
-    @OpLog(type = OtherOpLogType.class, name = "新增经销标准合同物料行，ID：{}", params = {"#id"})
+    @OpLog(type = OtherOpLogType.class, name = "新增合同物料行，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(CreateContractDistributorLineVo vo) {
@@ -94,14 +94,14 @@ public class ContractDistributorLineServiceImpl extends BaseMpServiceImpl<Contra
         return data.getId();
     }
 
-    @OpLog(type = OtherOpLogType.class, name = "修改经销标准合同物料行，ID：{}", params = {"#id"})
+    @OpLog(type = OtherOpLogType.class, name = "修改合同物料行，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void update(UpdateContractDistributorLineVo vo) {
 
         ContractDistributorLine data = getBaseMapper().selectById(vo.getId());
         if (ObjectUtil.isNull(data)) {
-            throw new DefaultClientException("经销标准合同物料行不存在！");
+            throw new DefaultClientException("合同物料行不存在！");
         }
 
         LambdaUpdateWrapper<ContractDistributorLine> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorLine.class)

@@ -103,7 +103,7 @@ public class ContractDistributorStandardServiceImpl extends
         return getBaseMapper().selectById(id);
     }
 
-    @OpLog(type = OtherOpLogType.class, name = "新增经销标准合同，ID：{}", params = {"#id"})
+    @OpLog(type = OtherOpLogType.class, name = "新增合同，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String create(CreateContractDistributorStandardVo vo) {
@@ -158,14 +158,14 @@ public class ContractDistributorStandardServiceImpl extends
         return data.getId();
     }
 
-    @OpLog(type = OtherOpLogType.class, name = "修改经销标准合同，ID：{}", params = {"#id"})
+    @OpLog(type = OtherOpLogType.class, name = "修改合同，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void update(UpdateContractDistributorStandardVo vo) {
 
         ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
         if (ObjectUtil.isNull(data)) {
-            throw new DefaultClientException("经销标准合同不存在！");
+            throw new DefaultClientException("合同不存在！");
         }
 
         LambdaUpdateWrapper<ContractDistributorStandard> updateWrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
@@ -305,7 +305,7 @@ public class ContractDistributorStandardServiceImpl extends
                 .set(ContractDistributorStandard::getStandardFileName, vo.getStandardFileName())
                 .set(ContractDistributorStandard::getStandardStandardized, vo.getStandardStandardized())
                 .set(ContractDistributorStandard::getStandardApproved, CustomerDevelopStatus.AUDIT.name());
-        if (!data.getStatus().equals("STANDARD")) {
+        if (!data.getStatus().equals("STANDARD") && "DISTRIB_STD".equals(data.getType())) { // 只有经销标准合同才修改状态
             updateWrapper.set(ContractDistributorStandard::getStatus, "STANDARD");
 
         }
@@ -371,6 +371,7 @@ public class ContractDistributorStandardServiceImpl extends
         vo.setStandardApproved(standardApproved);
         vo.setStandardTime(LocalDateTime.now());
         vo.setStandardApproved(SecurityUtil.getCurrentUser().getId());
+
         OpLogUtil.setVariable("id", id);
         OpLogUtil.setExtra(vo);
     }
@@ -455,6 +456,46 @@ public class ContractDistributorStandardServiceImpl extends
         return contractDistributorStandard;
     }
 
+    @Override
+    @OpLog(type = OtherOpLogType.class, name = "合同锁价，ID：{}", params = {"#vo.id"})
+    @Transactional(rollbackFor = Exception.class)
+    public void stockContractPriceLock(UpdateContractDistributorStandardVo vo) {
+        ContractDistributorStandard data = getBaseMapper().selectById(vo.getId());
+        if (ObjectUtil.isNull(data)) {
+            throw new DefaultClientException("合同不存在！");
+        }
+
+        List<UpdateContractDistributorLineVo> lineVoList = vo.getContractDistributorLineList();
+        if (CollectionUtils.isEmpty(lineVoList)) {
+            throw new DefaultClientException("合同行数据为空！");
+        }
+
+        Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaUpdate(ContractDistributorStandard.class)
+                .set(ContractDistributorStandard::getTotalQuantity, vo.getTotalQuantity())
+                .set(ContractDistributorStandard::getTotalAmountExcludingTax, vo.getTotalAmountExcludingTax())
+                .set(ContractDistributorStandard::getTotalAmountIncludingTax, vo.getTotalAmountIncludingTax())
+                .set(ContractDistributorStandard::getTotalAmountCapital, vo.getTotalAmountCapital())
+                .set(ContractDistributorStandard::getStatus, "STANDARD")
+                .eq(ContractDistributorStandard::getId, vo.getId());
+
+        getBaseMapper().update(wrapper);
+
+        lineVoList.forEach(lineVo -> {
+            Wrapper<ContractDistributorLine> contractDistributorLineWrapper = Wrappers.lambdaUpdate(ContractDistributorLine.class)
+                    .set(ContractDistributorLine::getQuantity, lineVo.getQuantity())
+                    .set(ContractDistributorLine::getUnitPrice, lineVo.getUnitPrice())
+                    .set(ContractDistributorLine::getAmountExcludingTax, lineVo.getAmountExcludingTax())
+                    .set(ContractDistributorLine::getTotalAmount, lineVo.getTotalAmount())
+                    .eq(ContractDistributorLine::getId, lineVo.getId());
+
+            contractDistributorLineService.update(contractDistributorLineWrapper);
+            contractDistributorLineService.cleanCacheByKey(lineVo.getId());
+        });
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -79,6 +79,13 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      * @param productIdList
      * @return
      */
-    ContractDistributorStandard getCustomerSpecificQualityRequirements(String customerId,List<String> productIdList);
+    ContractDistributorStandard getCustomerSpecificQualityRequirements(String customerId, List<String> productIdList);
+
+    /**
+     * 锁价
+     *
+     * @param vo
+     */
+    void stockContractPriceLock(UpdateContractDistributorStandardVo vo);
 
 }
\ No newline at end of file

@@ -218,31 +218,28 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     /**
      * 合计数量
      */
-    @ApiModelProperty(value = "合计数量", required = true)
-    @NotNull(message = "请输入合计数量！")
+    @ApiModelProperty(value = "合计数量")
     @TypeMismatch(message = "合计数量格式有误！")
     private BigDecimal totalQuantity;
 
     /**
      * 合计不含税金额
      */
-    @ApiModelProperty(value = "合计不含税金额", required = true)
-    @NotNull(message = "请输入合计不含税金额！")
+    @ApiModelProperty(value = "合计不含税金额")
     @TypeMismatch(message = "合计不含税金额格式有误！")
     private BigDecimal totalAmountExcludingTax;
 
     /**
      * 合计总金额
      */
-    @ApiModelProperty(value = "合计总金额", required = true)
-    @NotNull(message = "请输入合计总金额！")
+    @ApiModelProperty(value = "合计总金额")
     @TypeMismatch(message = "合计总金额格式有误！")
     private BigDecimal totalAmountIncludingTax;
 
     /**
      * 合同类型
      */
-    @ApiModelProperty(value = "合同类型", required = true)
+    @ApiModelProperty(value = "合同类型")
     @NotBlank(message = "请输入合同类型！")
     private String type;
 
@@ -253,10 +250,10 @@ public class CreateContractDistributorStandardVo implements BaseVo, Serializable
     private String parentId;
 
     /**
-     * 经销标准合同物料行
+     * 合同物料行
      */
-    @ApiModelProperty(value = "经销标准合同物料行", required = true)
-    @NotNull(message = "经销标准合同物料行不可为空！")
+    @ApiModelProperty(value = "合同物料行", required = true)
+    @NotNull(message = "合同物料行不可为空！")
     private List<CreateContractDistributorLineVo> contractDistributorLineList;
 
     /**

@@ -12,6 +12,8 @@ import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializable {
@@ -66,16 +68,28 @@ public class QueryContractFrameworkVo extends PageVo implements BaseVo, Serializ
      * 期限（查询）
      */
     @ApiModelProperty("期限查询开始时间")
-    @JsonFormat(pattern = StringPool.DATE_PATTERN)
-    private LocalDate validityTimeStart;
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime validityTimeStart;
 
     @ApiModelProperty("期限查询结束时间")
-    @JsonFormat(pattern = StringPool.DATE_PATTERN)
-    private LocalDate validityTimeEnd;
+    @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
+    private LocalDateTime validityTimeEnd;
 
     /**
      * 导出类型
      */
     @ApiModelProperty("导出类型")
     private String exportType;
+
+    /**
+     * 客户名称
+     */
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 客户Id集合
+     */
+    @ApiModelProperty("客户Id集合")
+    private List<String> customerIdList;
 }

@@ -33,40 +33,35 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     /**
      * 编号
      */
-    @ApiModelProperty(value = "编号", required = true)
-    @NotBlank(message = "请输入编号！")
+    @ApiModelProperty(value = "编号")
     @Length(message = "编号最多允许20个字符！")
     private String code;
 
     /**
      * 供方
      */
-    @ApiModelProperty(value = "供方", required = true)
-    @NotBlank(message = "请输入供方！")
+    @ApiModelProperty(value = "供方")
     @Length(message = "供方最多允许50个字符！")
     private String supplier;
 
     /**
      * 需方
      */
-    @ApiModelProperty(value = "需方", required = true)
-    @NotBlank(message = "请输入需方！")
+    @ApiModelProperty(value = "需方")
     @Length(message = "需方最多允许200个字符！")
     private String buyer;
 
     /**
      * 订货日期
      */
-    @ApiModelProperty(value = "订货日期", required = true)
+    @ApiModelProperty(value = "订货日期")
     @TypeMismatch(message = "订货日期格式有误！")
-    @NotNull(message = "请输入订货日期！")
     private LocalDate orderDate;
 
     /**
      * 单位
      */
-    @ApiModelProperty(value = "单位", required = true)
-    @NotBlank(message = "请输入单位！")
+    @ApiModelProperty(value = "单位")
     @Length(message = "单位最多允许50个字符！")
     private String unit;
 
@@ -80,8 +75,7 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     /**
      * 合计人民币金额（大写）
      */
-    @ApiModelProperty(value = "合计人民币金额（大写）", required = true)
-    @NotBlank(message = "请输入合计人民币金额（大写）！")
+    @ApiModelProperty(value = "合计人民币金额（大写）")
     @Length(message = "合计人民币金额（大写）最多允许100个字符！")
     private String totalAmountCapital;
 
@@ -258,10 +252,10 @@ public class UpdateContractDistributorStandardVo implements BaseVo, Serializable
     private String parentId;
 
     /**
-     * 经销标准合同物料行
+     * 合同物料行
      */
-    @ApiModelProperty(value = "经销标准合同物料行", required = true)
-    @NotNull(message = "经销标准合同物料行不可为空！")
+    @ApiModelProperty(value = "合同物料行")
+    @NotNull(message = "合同物料行不可为空！")
     private List<UpdateContractDistributorLineVo> contractDistributorLineList;
 
     /**

@@ -63,6 +63,12 @@
             <if test="vo.validityTimeEnd != null">
                 AND tb.validity_time &lt;= #{vo.validityTimeEnd}
             </if>
+            <if test="vo.customerIdList != null and vo.customerIdList.size() > 0">
+                AND tb.customer_id IN
+                <foreach collection="vo.customerIdList" open="(" separator="," close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 </mapper>