JK 4 år sedan
förälder
incheckning
f074dab9b5

+ 3 - 5
YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -158,12 +158,10 @@ public class PosMachineController {
                 PageHelper.startPage(request.getPageNum(), request.getPageSize());
                 List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
                 PageInfo pageInfo = new PageInfo(payOrderList);
-                //resultMap.put("listSum", pageInfo);
-                resultData = ResultData.success(pageInfo);
-            }else {
-                List<PayOrder> payOrderList = payOrderService.selectPayOrderList(payOrder);
-                resultMap.put("listSum", payOrderList);
+                resultMap.put("orderList", pageInfo);
                 resultData = ResultData.success(resultMap);
+            }else {
+                resultData = ResultData.error(CodeMsg.PARAMS_NUll);
             }
         }else {
             resultData = ResultData.error(CodeMsg.PARAMS_NUll);

+ 2 - 2
YijiaRestful/src/main/java/com/platform/yijia/utils/CodeMsg.java

@@ -23,12 +23,12 @@ public class CodeMsg {
     public static CodeMsg SEARCH_APPID_FAIL = new CodeMsg(-1,"油站公众号配置不完善");
     public static CodeMsg DELETE_FAIL = new CodeMsg(003,"删除失败");
     public static CodeMsg UPDATE_FAIL = new CodeMsg(004,"修改失败");
-    public static CodeMsg REQUEST_FAIL = new CodeMsg(005,"传参失败");
+    public static CodeMsg REQUEST_FAIL = new CodeMsg(-2,"必传参数不能为空");
     public static CodeMsg YEWU_FAIL = new CodeMsg(006,"业务失败");
     public static CodeMsg NO_CARDENABLEFLAG = new CodeMsg(-2,"未启用电会员卡");
 
     public static CodeMsg CHECK_DATA = new CodeMsg(007,"与后台检验不一致,请联系……");
-    public static CodeMsg PARAMS_NUll = new CodeMsg(010,"请求失败,参数缺失");
+    public static CodeMsg PARAMS_NUll = new CodeMsg(-2,"请求失败,必传参数不能为空!");
     public static CodeMsg WARSECOUNT_FAIL = new CodeMsg(-1,"库存不足");
     public static CodeMsg INTEGRAL_INSUFFICIENT = new CodeMsg(-2,"您的积分不足");
     private CodeMsg(int retCode, String message) {