Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/DankuanController.java

@@ -174,8 +174,8 @@ public class DankuanController {
             /**
             /**
              * 广美用来判断校区
              * 广美用来判断校区
              */
              */
-            if (StringUtil.isEmpty(productId) && "178".equals(productId)){
-                if (StringUtil.isEmpty(campus) && "1".equals(campus)){
+            if (StringUtils.isNotBlank(productId) && "84".equals(productId)){
+                if (StringUtils.isNotBlank(campus) && "1".equals(campus)){
                     orderView.setOrderRegion("海珠区");
                     orderView.setOrderRegion("海珠区");
                 }
                 }
             }
             }

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -7,6 +7,7 @@ import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.bean.*;
 import com.winsun.bean.*;
 import com.winsun.constant.OrderStatus;
 import com.winsun.constant.OrderStatus;
 import com.winsun.mapper.*;
 import com.winsun.mapper.*;
+import com.winsun.smsUtils.StringUtil;
 import com.winsun.utils.*;
 import com.winsun.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -162,6 +163,7 @@ public class RongHeController {
         String rhTime = request.getParameter("rhTime");
         String rhTime = request.getParameter("rhTime");
         String setMealIndex = request.getParameter("setMealIndex");
         String setMealIndex = request.getParameter("setMealIndex");
         String sell = request.getParameter("sell");
         String sell = request.getParameter("sell");
+        String campus = request.getParameter("campus");
 
 
         if(sell != null && StringUtils.isNumeric(sell)){
         if(sell != null && StringUtils.isNumeric(sell)){
 
 
@@ -209,6 +211,16 @@ public class RongHeController {
             orderView.setOrderCustomerAccount(orderCustomerAccount);// 多媒体账号
             orderView.setOrderCustomerAccount(orderCustomerAccount);// 多媒体账号
             orderView.setOrderCustomerPwd(orderCustomerPwd);// 多媒体密码
             orderView.setOrderCustomerPwd(orderCustomerPwd);// 多媒体密码
             orderView.setOrderSetMeal(orderSetMeal);// 套餐
             orderView.setOrderSetMeal(orderSetMeal);// 套餐
+
+            /**
+             * 广美用来判断校区
+             */
+            if (StringUtils.isNotBlank(productId) && "84".equals(productId)){
+                if (StringUtils.isNotBlank(campus) && "1".equals(campus)){
+                    orderView.setOrderRegion("海珠区");
+                }
+            }
+
             if ("".equals(setMealIndex) && !setMealIndex.matches("[0-9]*")) {
             if ("".equals(setMealIndex) && !setMealIndex.matches("[0-9]*")) {
                 if (orderSetMeal.indexOf("包年") != -1) {
                 if (orderSetMeal.indexOf("包年") != -1) {
                     mealStr = orderSetMeal.replace("包年", "");
                     mealStr = orderSetMeal.replace("包年", "");