外部订单聚水潭地址必填项调整,收件人电话必填项调整

fs-admin/src/main/java/com/fs/web/controller/tool/TestController.java

@@ -109,8 +109,8 @@ public class TestController extends BaseController {
      * 测试推积分订单到聚水潭
      */
     @GetMapping("/pushIntegralOrderToJst")
-    public R pushIntegralOrderToJst() throws ParseException, InterruptedException {
-        task.createOmsIntegralOrder();
+    public R pushIntegralOrderToJst() throws Exception {
+        task.pushExternalOrderToJst();
         return R.ok();
     }
 

fs-service/src/main/java/com/fs/his/service/impl/FsExternalOrderServiceImpl.java

@@ -267,6 +267,10 @@ public class FsExternalOrderServiceImpl implements IFsExternalOrderService {
             return R.error("订单号已存在");
         }
 
+        if(StringUtils.isEmpty(param.getReceiverPhone())){
+            return  R.error("收件人电话不能为空");
+        }
+
         if (CollectionUtils.isEmpty(param.getProducts())) {
             return R.error("商品列表不能为空");
         }
@@ -585,6 +589,11 @@ public class FsExternalOrderServiceImpl implements IFsExternalOrderService {
                     shopOrderDTO.setReceiverCity((String) addData.get("CityName"));
                     shopOrderDTO.setReceiverDistrict((String) addData.get("ExpAreaName"));
                     shopOrderDTO.setReceiverAddress((String) addData.get("StreetName") + addData.get("Address"));
+                }else {
+                    shopOrderDTO.setReceiverState(Arrays.toString(address));
+                    shopOrderDTO.setReceiverCity(Arrays.toString(address));
+                    shopOrderDTO.setReceiverDistrict(Arrays.toString(address));
+                    shopOrderDTO.setReceiverAddress(Arrays.toString(address));
                 }
             } catch (Exception e) {
                 //默认帮我解析一下地址 给这几个字段赋值