wusiwei

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

@@ -10,6 +10,7 @@ import com.winsun.constant.Constant;
 import com.winsun.constant.OrderStatus;
 import com.winsun.mapper.*;
 import com.winsun.outSideSystem.IntelligenceSendOrder;
+import com.winsun.smsUtils.StringUtil;
 import com.winsun.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -125,6 +126,9 @@ public class DankuanController {
         String setMealIndex = request.getParameter("setMealIndex");
         String imgUrl = request.getParameter("imgUrl");
         String sell = request.getParameter("sell");
+        String campus = request.getParameter("campus");
+
+
         if(sell != null && StringUtils.isNumeric(sell)){
 
         }else {
@@ -167,6 +171,15 @@ public class DankuanController {
             orderView.setPayType("1");
             orderView.setWebOrderAmount(webOrderAmount);
 
+            /**
+             * 广美用来判断校区
+             */
+            if (StringUtil.isEmpty(productId) && "178".equals(productId)){
+                if (StringUtil.isEmpty(campus) && "1".equals(campus)){
+                    orderView.setOrderRegion("海珠区");
+                }
+            }
+
             if (webOrderAmount.equals("0")) {
                 orderView.setIPay("0");
             } else {

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

@@ -162,6 +162,7 @@ public class RongHeController {
         String rhTime = request.getParameter("rhTime");
         String setMealIndex = request.getParameter("setMealIndex");
         String sell = request.getParameter("sell");
+
         if(sell != null && StringUtils.isNumeric(sell)){
 
         }else {

service-manager/src/main/java/com/winsun/controller/ActivityController.java

@@ -29,9 +29,10 @@ import java.util.*;
 @RequestMapping("/activity")
 public class ActivityController extends BaseController {
 
+	private static String PATH_TYPE = "activity";
+
 	@Autowired
 	private ActivityMapper activityMapper;
-	private static String PATH_TYPE = "activity";
 
 	@Autowired
 	private HhrUserMapper hhrUserMapper;
@@ -45,8 +46,8 @@ public class ActivityController extends BaseController {
 			@RequestParam(name = "status", required = false) String status,
 			@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
 			@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
-			@RequestParam(name = "pageNo", required = false) int pageIndex,
-			@RequestParam(name = "pageSize", required = false) int pageSize) {
+			@RequestParam(name = "pageNo", required = false) Integer pageIndex,
+			@RequestParam(name = "pageSize", required = false) Integer pageSize) {
 		Wrapper<HhrActivity> wrapper = new EntityWrapper<HhrActivity>();
 		wrapper.like(StringUtils.isNotBlank(title), "title", title, SqlLike.DEFAULT);
 		wrapper.eq(StringUtils.isNotBlank(activityType), "activity_type", activityType);

service-manager/src/main/java/com/winsun/controller/BillController.java

@@ -861,8 +861,9 @@ public class BillController extends BaseController{
  			}
  			
  			// 找到对应支出，则跳出本次循环
- 			if(isFind)
- 				continue;
+ 			if(isFind) {
+				continue;
+			}
  			
  			// 没找到，则支出项留空
  			map.put("month", (String)map1.get("month"));