添加maopenid验证

fs-service/src/main/java/com/fs/core/utils/OrderCodeUtils.java

@@ -44,16 +44,16 @@ public class OrderCodeUtils {
 
     }
     public static String getOrderSn(){
-        String url= FSConfig.getCommonApi()+ "/app/common/genOrderCode";
-//        String url= "42.194.245.189:8010/app/common/genOrderCode";
-        String json = HttpRequest.get(url)
-                .execute().body();
-        OrderCodeVO vo= JSONUtil.toBean(json, OrderCodeVO.class);
-        if(vo.getCode()==200){
-            return vo.getOrderCode();
-        }
-        else return null;
-//        return OrderCodeUtils.genOrderSn();
+//        String url= FSConfig.getCommonApi()+ "/app/common/genOrderCode";
+////        String url= "42.194.245.189:8010/app/common/genOrderCode";
+//        String json = HttpRequest.get(url)
+//                .execute().body();
+//        OrderCodeVO vo= JSONUtil.toBean(json, OrderCodeVO.class);
+//        if(vo.getCode()==200){
+//            return vo.getOrderCode();
+//        }
+//        else return null;
+        return OrderCodeUtils.genOrderSn();
 
     }
 

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

@@ -829,6 +829,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     @Override
     @Transactional
     public R createOrder(long userId, FsStoreOrderCreateParam param) {
+        FsUserScrm fsuser= userService.selectFsUserById(userId);
+        if(StringUtils.isEmpty(fsuser.getMaOpenId())){
+            return R.error(401,"请重新授权登录");
+        }
         FsStoreOrderComputedParam computedParam = new FsStoreOrderComputedParam();
         BeanUtils.copyProperties(param, computedParam);
         //计算金额
@@ -868,7 +872,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             String json = configService.selectConfigByKey("store.config");
             StoreConfig config= JSONUtil.toBean(json, StoreConfig.class);
             //绑定销售
-            FsUserScrm fsuser= userService.selectFsUserById(userId);
             if(ObjectUtil.isEmpty(config.getOrderAttribution())
                     ||!config.getOrderAttribution().equals(1)){
                 if(param.getCompanyUserId()!=null){
@@ -4193,6 +4196,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
 
         FsUserScrm user=userService.selectFsUserById(order.getUserId());
+        if(StringUtils.isEmpty(user.getMaOpenId())){
+            return R.error(401,"请重新授权登录");
+        }
         if(user!=null){
             //已改价处理
             if(order.getIsEditMoney()!=null&&order.getIsEditMoney()==1){

fs-service/src/main/java/com/fs/newAdv/domain/Lead.java

@@ -76,7 +76,7 @@ public class Lead implements Serializable {
     /**
      * 外部联系人id 添加人id
      */
-    private String externalUserId;
+    //private String externalUserId;
     /**
      * 属于用户id 被添加的id
      */

fs-service/src/main/java/com/fs/newAdv/service/impl/LeadServiceImpl.java

@@ -89,7 +89,7 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
                 .eq(Lead::getAddContactQwGroup, 0)
                 .last("LIMIT 1"));
         if (lead != null) {
-            lead.setExternalUserId(externalUserID);
+            //lead.setExternalUserId(externalUserID);
             lead.setCorpId(corpId);
             lead.setUserId(userID);
             lead.setAddContactQwGroup(1);

fs-user-app/src/main/resources/application.yml

@@ -7,8 +7,8 @@ server:
 # Spring配置
 spring:
   profiles:
-#    active: druid-myhk-test
-    active: dev
+    active: druid-jnsyj-test
+#    active: dev
 #    active: druid-jzzx
 #    active: druid-yzt
 #    active: druid-hdt