bugfix

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/entity/KwcContractTrade.java

@@ -1,5 +1,7 @@
 package com.sckw.contract.model.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
@@ -53,6 +55,7 @@ public class KwcContractTrade implements Serializable {
     /**
      * 结束日期
      */
+    @TableField(insertStrategy = FieldStrategy.IGNORED, updateStrategy = FieldStrategy.IGNORED)
     private Date endTime;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/req/CompleteReqVo.java

@@ -1,6 +1,8 @@
 package com.sckw.contract.model.vo.req;
 
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 
 import java.io.Serial;
@@ -27,6 +29,8 @@ public class CompleteReqVo implements Serializable {
     /**
      * 备注
      */
+    @NotBlank(message = "备注不能为空")
+    @Size(max = 200, message = "备注超长")
     private String remark;
 
     /**

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/model/vo/res/TradeGoodsInfoResVo.java

@@ -22,6 +22,11 @@ public class TradeGoodsInfoResVo implements Serializable {
      */
     private BigDecimal amount;
 
+    /**
+     * 商品
+     */
+    private Long goodsId;
+
     /**
      * 商品
      */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -287,7 +287,7 @@ public class KwcContractTradeService {
                 tradeGoodsInfoResVo.setAmount(kwcContractTradeGoods.getAmount());
                 tradeGoodsInfoResVo.setPrice(kwcContractTradeGoods.getPrice());
                 tradeGoodsInfoResVo.setUnit(kwcContractTradeGoods.getUnit());
-
+                tradeGoodsInfoResVo.setGoodsId(kwcContractTradeGoods.getGoodsId());
                 KwpGoods kwpGoods = goodsMap.get(kwcContractTradeGoods.getGoodsId());
                 if (Objects.nonNull(kwpGoods)) {
                     tradeGoodsInfoResVo.setGoodsName(kwpGoods.getName());
@@ -335,30 +335,35 @@ public class KwcContractTradeService {
      * @author: czh
      * @date 2023/7/16
      */
+    @Transactional(rollbackFor = {})
     public void submit(ContractTradeReqVo reqVo) {
         Long id = reqVo.getId();
         if (Objects.isNull(id)) {
             //创建合同
-            KwcContractTrade kwcContractLogistics = getKwcContractTrade(reqVo.getBaseInfo(), reqVo.getGoodsInfo(), reqVo.getRemark(), reqVo.getPid());
-            id = new IdWorker(1L).nextId();
-            kwcContractLogistics.setId(id);
-            kwcContractLogistics.setStatus(ContractStatusEnum.SUBMIT.getCode());
-            kwcContractLogistics.setSigningUrl(reqVo.getContractFile());
-            if (kwcContractTradeMapper.insert(kwcContractLogistics) <= 0) {
-                throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.INSERT_FAIL);
-            }
-
-            //存审批记录
-            kwcContractTradeTrackService.saveContractTradeTrack(id);
+            id = addTradeContract(reqVo);
+            changeToSubmit(id);
             return;
         }
+        update(reqVo);
+        changeToSubmit(id);
+    }
+
 
-        id = addTradeContract(reqVo);
-        //存审批记录
+    /**
+     * @param id 合同id
+     * @desc: 更新合同为发起
+     * @author: czh
+     * @date: 2023/7/20
+     */
+    private void changeToSubmit(Long id) {
+        KwcContractTrade kwcContractTrade = kwcContractTradeMapper.selectById(id);
+        kwcContractTrade.setStatus(ContractStatusEnum.SUBMIT.getCode());
+        if (kwcContractTradeMapper.updateById(kwcContractTrade) <= 0) {
+            throw new SystemException(HttpStatus.CRUD_FAIL_CODE, HttpStatus.UPDATE_FAIL);
+        }
         kwcContractTradeTrackService.saveContractTradeTrack(id);
     }
 
-
     /**
      * @desc: 修改草稿
      * @param: reqVo 入参

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/model/vo/req/AddressAddReqVo.java

@@ -1,6 +1,8 @@
 package com.sckw.manage.model.vo.req;
 
+import com.sckw.core.utils.RegularUtils;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 
@@ -33,6 +35,7 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 联系人
      */
+    @Pattern(regexp = RegularUtils.NAME, message = "联系人格式不正确")
     private String contacts;
 
     /**
@@ -63,6 +66,7 @@ public class AddressAddReqVo implements Serializable {
     /**
      * 联系人电话
      */
+    @Pattern(regexp = RegularUtils.PHONE_REG, message = "手机号格式不正确")
     private String phone;
 
     /**

sckw-modules/sckw-manage/src/main/java/com/sckw/manage/service/KwmAddressService.java

@@ -79,7 +79,8 @@ public class KwmAddressService {
                 eq(KwmAddress::getDelFlag, Global.NO).
                 and(StringUtils.isNotBlank(reqVo.getKeywords()),
                         wq -> wq.like(KwmAddress::getDetailAddress, reqVo.getKeywords()).or().
-                                like(KwmAddress::getCityName, reqVo.getKeywords()));
+                                like(KwmAddress::getCityName, reqVo.getKeywords())).
+                orderByDesc(KwmAddress::getUpdateTime);
 
         if (Objects.nonNull(reqVo.getStartTime())) {
             wrapper.ge(KwmAddress::getCreateTime, reqVo.getStartTime());