问诊和套餐包下单前计算openid判断红德堂特殊处理

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

@@ -21,10 +21,7 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.CustomException;
-import com.fs.common.utils.DateUtils;
-import com.fs.common.utils.SecurityUtils;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.*;
 import com.fs.common.utils.ip.IpUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
@@ -315,28 +312,26 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             param.setUserCouponId(order.getUserCouponId());
         }
         FsUser user=userService.selectFsUserByUserId(order.getUserId());
+        if (Objects.isNull(user)){
+            return R.error("用户不存在");
+        }
+
         if (param.getType()==1) {
-            if(user!=null&& StringUtils.isNotEmpty(user.getMaOpenId())){
-                param.setCompanyId(order.getCompanyId());
-                param.setCompanyUserId(order.getUserId());
-                param.setStoreId(order.getStoreId());
-                Map<String,Object> moneys=computeOrderMoney(order.getTotalPrice(),param);
-                return R.ok().put("moneys",moneys);
-            }
-            else{
+            if (StringUtils.isBlank(user.getMaOpenId()) && !CloudHostUtils.isCloudHostName("弘德堂")) {
                 return R.error("用户OPENID不存在");
             }
+
+            param.setCompanyId(order.getCompanyId());
+            param.setCompanyUserId(order.getUserId());
+            param.setStoreId(order.getStoreId());
+            Map<String,Object> moneys=computeOrderMoney(order.getTotalPrice(),param);
+            return R.ok().put("moneys",moneys);
         }else if (param.getType()==2){
-            if(user!=null){
-                param.setCompanyId(order.getCompanyId());
-                param.setCompanyUserId(order.getUserId());
-                param.setStoreId(order.getStoreId());
-                Map<String,Object> moneys=computeOrderMoney(order.getTotalPrice(),param);
-                return R.ok().put("moneys",moneys);
-            }
-            else{
-                return R.error("用户不存在");
-            }
+            param.setCompanyId(order.getCompanyId());
+            param.setCompanyUserId(order.getUserId());
+            param.setStoreId(order.getStoreId());
+            Map<String,Object> moneys=computeOrderMoney(order.getTotalPrice(),param);
+            return R.ok().put("moneys",moneys);
         }else {
             return R.error("无效的类型参数");
         }

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

@@ -138,18 +138,18 @@ public class InquiryOrderController extends  AppBaseController {
         }
 
         FsUser user=userService.selectFsUserByUserId(order.getUserId());
+        if (Objects.isNull(user)) {
+            return R.error("用户不存在");
+        }
+
         if (param.getType() == 1) {
-            if (user != null && StringUtils.isNotEmpty(user.getMaOpenId())) {
-                return inquiryOrderService.computeOrder(param, order, user);
-            } else {
+            if (StringUtils.isBlank(user.getMaOpenId()) && !CloudHostUtils.isCloudHostName("弘德堂")) {
                 return R.error("用户OPENID不存在");
             }
+
+            return inquiryOrderService.computeOrder(param, order, user);
         } else if (param.getType() == 2) {
-            if (user != null) {
-                return inquiryOrderService.computeOrder(param, order, user);
-            } else {
-                return R.error("用户不存在");
-            }
+            return inquiryOrderService.computeOrder(param, order, user);
         } else {
             return R.error("无效的类型参数");
         }