feat：自提商品联调

fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderPickAddParam.java

@@ -14,8 +14,8 @@ public class FsStoreOrderPickAddParam {
     @NotNull
     private Long userId;
 
-    /** 自提地址 */
-    private String pickupAddress;
+//    /** 自提地址 */
+//    private String pickupAddress;
 
     /** 商品id */
     @NotNull

fs-service/src/main/java/com/fs/hisStore/param/FsStoreProductUserRecordAddParam.java

@@ -11,8 +11,9 @@ import java.util.List;
 @Data
 public class FsStoreProductUserRecordAddParam {
 
-//    /** 模板ID */
-//    private Long tempId;
+    /** 模板ID */
+    @NotNull
+    private Long tempId;
 
     /** 商品ID */
     @NotNull

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderPickServiceImpl.java

@@ -221,8 +221,12 @@ public class FsStoreOrderPickServiceImpl extends ServiceImpl<FsStoreOrderPickMap
         order.setUserId(user.getUserId());
         String realName = StringUtils.isNotEmpty(user.getNickName()) ? user.getNickName() : user.getNickname();
         order.setRealName(realName);
-        order.setUserPhone(user.getPhone());
-        order.setUserAddress(param.getPickupAddress());
+        // 电话解码
+        if(user.getPhone().length() > 11){
+            order.setUserPhone(PhoneUtil.decryptPhone(user.getPhone()));
+        } else {
+            order.setUserPhone(user.getPhone());
+        }
         order.setTotalNum(1L);
 
         // 计算订单价格
@@ -269,6 +273,7 @@ public class FsStoreOrderPickServiceImpl extends ServiceImpl<FsStoreOrderPickMap
         jsonInfo.setNum(param.getProductNum());
         jsonInfo.setProductName(product.getProductName());
         jsonInfo.setPrice(priceN);
+        jsonInfo.setShippingType(product.getShippingType());
         orderItem.setJsonInfo(JSONUtil.toJsonStr(jsonInfo));
         fsStoreOrderItemScrmMapper.insertFsStoreOrderItem(orderItem);
         List<FsStoreOrderItemScrm> itemList = new ArrayList<>();
@@ -752,5 +757,7 @@ public class FsStoreOrderPickServiceImpl extends ServiceImpl<FsStoreOrderPickMap
         private Integer num;
         private String productName;
         private BigDecimal price;
+        /* 配送方式，1-自提；2-物流 */
+        private Integer shippingType;
     }
 }

fs-user-app/src/main/java/com/fs/app/controller/store/FsStoreProductUserRecordController.java

@@ -9,6 +9,7 @@ import com.fs.hisStore.param.FsStoreProductUserRecordAddParam;
 import com.fs.hisStore.service.IFsStoreProductUserRecordService;
 import com.fs.hisStore.vo.FsStoreProductUserTempDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -52,7 +53,7 @@ public class FsStoreProductUserRecordController extends AppBaseController
      */
     @Login
     @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductUserRecordAddParam param)
+    public AjaxResult add(@Validated @RequestBody FsStoreProductUserRecordAddParam param)
     {
         return toAjax(fsStoreProductUserRecordService.insertFsStoreProductUserRecordWithValues(param));
     }