删除user openId判断

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseOrderServiceImpl.java

@@ -497,10 +497,10 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
 
                     }
 
-                } else {
-                    return R.error("用户OPENID不存在");
                 }
             }
+        } else {
+            return R.error("用户OPENID不存在");
         }
         return R.error();
     }
@@ -739,7 +739,7 @@ public class FsUserCourseOrderServiceImpl implements IFsUserCourseOrderService
             param.setUserCouponId(order.getUserCouponId());
         }
         FsUser user=fsUserMapper.selectFsUserByUserId(order.getUserId());
-        if(user!=null&& StringUtils.isNotEmpty(user.getMaOpenId())){
+        if(user!=null){
             Map<String,Object> moneys=computeOrderMoney(order.getPayPrice(),param);
             return R.ok().put("moneys",moneys);
         }

fs-service/src/main/java/com/fs/course/service/impl/FsUserVipOrderServiceImpl.java

@@ -354,10 +354,10 @@ public class FsUserVipOrderServiceImpl implements IFsUserVipOrderService
                         storePaymentService.updateFsStorePayment(mt);
                         return R.ok().put("isPay", 0).put("data", result).put("type", "hf");
                     }
-                } else {
-                    return R.error("用户OPENID不存在");
                 }
             }
+        }  else {
+            return R.error("用户OPENID不存在");
         }
         return R.error();
     }

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

@@ -313,7 +313,10 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         }
 
         if (param.getType()==1) {
-            if (StringUtils.isBlank(user.getMaOpenId()) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
+//            if (StringUtils.isBlank(user.getMaOpenId()) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
+//                return R.error("用户OPENID不存在");
+//            }
+            if (!CloudHostUtils.hasCloudHostName("弘德堂")) {
                 return R.error("用户OPENID不存在");
             }
 
@@ -1211,7 +1214,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         }
         //如果存在优惠券  判断优惠券是否已使用
         FsUser user=userService.selectFsUserByUserId(param.getUserId());
-        if(user!=null&& StringUtils.isNotEmpty(user.getMpOpenId())){
+        if(user!=null){
             if(fsPackageOrder.getPayMoney().compareTo(new BigDecimal(0))==1){
                 String json = configService.selectConfigByKey("his.pay");
                 PayConfigDTO payConfigDTO = JSONUtil.toBean(json, PayConfigDTO.class);

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

@@ -1210,7 +1210,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
 
         FsUser user = userService.selectFsUserByUserId(order.getUserId());
         Map<String, BigDecimal> data = new HashMap<>();
-        if (user != null && StringUtils.isNotEmpty(user.getMaOpenId())) {
+        if (user != null ) {
             if (param.getUserCouponId() != null && param.getUserCouponId() > 0l) {
                 FsUserCoupon userCoupon = userCouponService.selectFsUserCouponById(param.getUserCouponId());
                 if (userCoupon == null) {

fs-user-app/src/main/java/com/fs/app/controller/InquiryOrderController.java

@@ -144,7 +144,10 @@ public class InquiryOrderController extends  AppBaseController {
         }
 
         if (param.getType() == 1) {
-            if (StringUtils.isBlank(user.getMaOpenId()) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
+//            if (StringUtils.isBlank(user.getMaOpenId()) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
+//                return R.error("用户OPENID不存在");
+//            }
+            if (!CloudHostUtils.hasCloudHostName("弘德堂")) {
                 return R.error("用户OPENID不存在");
             }
 
@@ -180,7 +183,7 @@ public class InquiryOrderController extends  AppBaseController {
         if(user!=null){
 
             // 红德堂特殊处理
-            if (!CloudHostUtils.hasCloudHostName("弘德堂") && StringUtils.isBlank(user.getMaOpenId())) {
+            if (!CloudHostUtils.hasCloudHostName("弘德堂")) {
                 return R.error("用户OPENID不存在");
             }
 

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

@@ -295,7 +295,7 @@ public class StoreOrderScrmController extends AppBaseController {
         }
 
         FsUserScrm user=userService.selectFsUserById(order.getUserId());
-        if(user!=null&& StringUtils.isNotEmpty(user.getMaOpenId())){
+        if(user!=null){
             //已改价处理
             if(order.getIsEditMoney()!=null&&order.getIsEditMoney()==1){
                 //改过价不做处理
@@ -453,7 +453,7 @@ public class StoreOrderScrmController extends AppBaseController {
             }
         }
         FsUserScrm user=userService.selectFsUserById(order.getUserId());
-        if(user!=null&& StringUtils.isNotEmpty(user.getMaOpenId())){
+        if(user!=null){
             //已改价处理
             if(order.getIsEditMoney()!=null&&order.getIsEditMoney()==1){
                 //改过价不做处理
@@ -522,7 +522,7 @@ public class StoreOrderScrmController extends AppBaseController {
             return R.error("此订单已支付");
         }
         FsUserScrm user=userService.selectFsUserById(order.getUserId());
-        if(user!=null&& StringUtils.isNotEmpty(user.getMaOpenId())){
+        if(user!=null){
             String payCode = IdUtil.getSnowflake(0, 0).nextIdStr();
             String json = configService.selectConfigByKey(STORE_PAY_CONF);
             FsPayConfigScrm fsPayConfig = JSON.parseObject(json, FsPayConfigScrm.class);