app支付/销售端 登录

fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -255,7 +255,8 @@ public class CompanyUserController extends AppBaseController {
         // 查询公司下销售
         CompanyUser companyUser = new CompanyUser();
         companyUser.setCompanyId(getCompanyId());
-        List<CompanyUser> companyUsers = companyUserService.selectCompanyUserList(companyUser);
+//        List<CompanyUser> companyUsers = companyUserService.selectCompanyUserList(companyUser);
+        List<CompanyUser> companyUsers = companyUserService.selectCompanyUserListByCompanyId(companyUser);
         return R.ok().put("data",companyUsers);
     }
 

fs-service/src/main/java/com/fs/company/service/ICompanyUserService.java

@@ -48,6 +48,7 @@ public interface ICompanyUserService {
      * @return 物业公司管理员信息集合
      */
     public List<CompanyUser> selectCompanyUserList(CompanyUser companyUser);
+    public List<CompanyUser> selectCompanyUserListByCompanyId(CompanyUser companyUser);
 
     /**
      * 新增物业公司管理员信息

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -179,6 +179,11 @@ public class CompanyUserServiceImpl implements ICompanyUserService
         return companyUserMapper.selectCompanyUserList(companyUser);
     }
 
+    @Override
+    public List<CompanyUser> selectCompanyUserListByCompanyId(CompanyUser companyUser) {
+        return companyUserMapper.selectCompanyUserList(companyUser);
+    }
+
     /**
      * 新增物业公司管理员信息
      *

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -4396,7 +4396,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveOrder.setPayType("1");
         liveOrder.setTotalPrice(payPrice);
         liveOrder.setPayPrice(payPrice.subtract(liveOrder.getDiscountMoney()));
-        if(CloudHostUtils.hasCloudHostName("济世百康")) {
+        if(CloudHostUtils.hasCloudHostName("济世百康","蒙牛")) {
             liveOrder.setPayMoney(payPrice.subtract(liveOrder.getDiscountMoney()));
         }
         try {

fs-user-app/src/main/java/com/fs/app/controller/live/LiveOrderController.java

@@ -340,7 +340,7 @@ public class LiveOrderController extends AppBaseController
         String userId= getUserId();
         log.info("开始创建订单,登录用户id:{}", userId);
         param.setUserId(userId);
-        if(CloudHostUtils.hasCloudHostName("济世百康")){
+        if(CloudHostUtils.hasCloudHostName("济世百康","蒙牛")){
             return  orderService.createLiveOrder(param);
         }else{
             return orderService.createStoreOrder(param);