soodo优化

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/channel/AdminChannelHandler.java

@@ -1,17 +1,22 @@
 package com.iamberry.wechat.handles.channel;
 
+import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.banner.MessageDTO;
 import com.iamberry.wechat.core.entity.channel.ChannelRebate;
 import com.iamberry.wechat.core.entity.coupon.AdminCouponItemDto;
 import com.iamberry.wechat.core.entity.page.PageRequest;
 import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.core.entity.receive.ChargerReceive;
 import com.iamberry.wechat.face.channel.ChannelRebateService;
 import com.iamberry.wechat.face.coupon.AdminCouponItemService;
+import com.iamberry.wechat.tools.NameUtils;
+import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.utils.StitchAttrUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
@@ -69,7 +74,40 @@ public class AdminChannelHandler {
 		if (totalNum != 0) {
 			result.setTotal(totalNum);
 		}
-		StitchAttrUtil.getSa().setModelAndView(channelRebate, mv, "/admin/channel/listChannelRebate", result);
+		StitchAttrUtil sa = StitchAttrUtil.getSa();
+		sa.addDatePro("yyyy-MM-dd","stateDate","endDate");
+		sa.setModelAndView(channelRebate, mv, "/admin/channel/listChannelRebate", result);
 		return mv;
 	}
+
+	/**
+	 * 发货
+	 * 2018年2月24日
+	 * @author mzx
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping("/update_state")
+	public ResultMsg update_state(ChannelRebate channelRebate, HttpServletRequest request) throws Exception {
+		ResultMsg msg = new ResultMsg();
+		if(channelRebate.getRebateId() == null  || channelRebate.getRebackStatus() == null || "".equals(channelRebate.getRebateId())
+				|| channelRebate.getRebackStatus() == null){
+			msg.setMessage(NameUtils.getConfig("ERRORCODE"));
+			msg.setResultCode(ResultInfo.ERRORCODE);
+			msg.setStatus(false);
+			return msg;
+		}
+		Integer flag = channelRebateService.update(channelRebate);
+		if(flag == 1){
+			msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+			msg.setResultCode(ResultInfo.SUCCESSCODE);
+			msg.setStatus(true);
+			return msg;
+		}else{
+			msg.setMessage(NameUtils.getConfig("ERRORCODE"));
+			msg.setResultCode(ResultInfo.ERRORCODE);
+			msg.setStatus(false);
+			return msg;
+		}
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/utils/StitchAttrUtil.java

@@ -66,6 +66,9 @@ public class StitchAttrUtil {
 
         modelAndView.addObject("page", pagedResult);
         modelAndView.addObject("url", sb.toString());
+
+        modelAndView.addObject("pageNO", pagedResult.getPageNO());
+        modelAndView.addObject("pageSize", pagedResult.getPages());
         return;
     }
 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/channelRebate_list.jsp

@@ -45,8 +45,8 @@
 					</select>
 		</span>
         <input name="salesOrderid" id="salesOrderid" value="${salesOrderid }" placeholder="订单编号" style="width: 150px" class="input-text" type="text">
-        日期范围： <input  id="stateDates" value="${stateDate }" name="stateDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDates\')||\'%y-%M-%d\'}'})" readonly>
-        - <input  id="endDates" value="${endDate }" name="endDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'stateDates\')||\'%y-%M-%d\'}'})" readonly>
+        日期范围： <input  id="stateDates" value="<fmt:formatDate value="${stateDate}" pattern="yyyy-MM-dd"/>" name="stateDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'#F{$dp.$D(\'endDates\')||\'%y-%M-%d\'}'})" readonly>
+        - <input  id="endDates" value="<fmt:formatDate value="${endDate}" pattern="yyyy-MM-dd"/>" name="endDates" class="input-text Wdate" style="width: 120px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'stateDates\')||\'%y-%M-%d\'}'})" readonly>
        <button name="" id="submitBtn" class="btn btn-success" type="submit">
             <i class="Hui-iconfont"></i> 搜索
         </button>
@@ -84,7 +84,7 @@
                 <td>${infolist.rebackAmount}</td>
                 <td>${infolist.rebackStatus==1?'待返利':''}${infolist.rebackStatus==2?'已返利入账':''}${infolist.rebackStatus==3?'已取消':''}</td>
                 <td><fmt:formatDate value="${infolist.rebackTime}" pattern="yyyy-MM-dd"/></td>
-                <td></td>
+                <td><a>标记已返利</a></td>
                 </c:forEach>
                 </c:if>
                 <c:if test="${empty page.dataList}">