POS修改

YijiaRestful/src/main/java/com/platform/yijia/controller/CouponController.java

@@ -525,6 +525,7 @@ public class CouponController {
         if(StringUtils.isNotBlank(couponVerificationUser.getMobilePhone()) && StringUtils.isNotBlank(couponVerificationUser.getUnionId())){
             //手机号
             String mobilePhone = couponVerificationUser.getMobilePhone();
+            logger.info("核销人员登录核销小程序：手机号："+ mobilePhone +" ;");
             SysUser sysUser = new SysUser();
             sysUser.setPhonenumber(mobilePhone);
             sysUser.setStatus("0");

YijiaRestful/src/main/java/com/platform/yijia/controller/PosMachineController.java

@@ -287,7 +287,7 @@ public class PosMachineController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(stationId !=null && classStructureNo !=null){
+        if(stationId !=null &&  StringUtils.isNotBlank(classStructureNo)){
             logger.info("查看POS上某个班结参数信息：油站ID："+ stationId.toString() + "班结好："+ classStructureNo);
             StationClassStructure classes =new StationClassStructure();
             classes.setStationId(stationId);
@@ -296,56 +296,65 @@ public class PosMachineController {
             scs.setStationId(stationId);
             scs.setClassesNo(classStructureNo);
             List<StationClassesSummary> stationClassesSummaryList = stationClassesSummaryService.selectStationClassesSummaryList(scs);
-            classes.setClassStartDate(stationClassesSummaryList.get(0).getStartDate());
-            classes.setClassStructureDate(stationClassesSummaryList.get(0).getEndDate());
-            classes.setStatus("1");
-
-            //总数据
-            classes.setGroupBy("");
-            List<Map<String, String>> listSum = stationClassStructureService.selectClassStructureSum(classes);
-
-            //listSum 添加退款总金额  refundAmtSum
-            classes.setStatus("3");
-            PayOrder payOrder = new PayOrder();
-            payOrder.setStatus("3");
-            payOrder.setStationId(stationId);
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            payOrder.setBeginTime(dateFormat.format(stationClassesSummaryList.get(0).getStartDate()));
-            payOrder.setEndTime(dateFormat.format(stationClassesSummaryList.get(0).getEndDate()));
-            Map<String, Object> refundAmtResult = payOrderService.selectRefundAmtSum(payOrder);
-            if(refundAmtResult !=null && refundAmtResult.containsKey("refundAmtSum")){
-                listSum.get(0).put("refundAmtSum", refundAmtResult.get("refundAmtSum").toString());
+            if(stationClassesSummaryList !=null && stationClassesSummaryList.size()>0){
+                classes.setClassStartDate(stationClassesSummaryList.get(0).getStartDate());
+                classes.setClassStructureDate(stationClassesSummaryList.get(0).getEndDate());
+                classes.setStatus("1");
+
+                //总数据
+                classes.setGroupBy("");
+                List<Map<String, String>> listSum = stationClassStructureService.selectClassStructureSum(classes);
+
+                //退款汇总
+                classes.setStatus("3");
+                List<Map<String, String>> listSumRefund = stationClassStructureService.selectClassStructureSum(classes);
+//                //listSum 添加退款总金额  refundAmtSum
+//                PayOrder payOrder = new PayOrder();
+//                payOrder.setStatus("3");
+//                payOrder.setStationId(stationId);
+//                DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//                payOrder.setBeginTime(dateFormat.format(stationClassesSummaryList.get(0).getStartDate()));
+//                payOrder.setEndTime(dateFormat.format(stationClassesSummaryList.get(0).getEndDate()));
+//                Map<String, Object> refundAmtResult = payOrderService.selectRefundAmtSum(payOrder);
+//                if(refundAmtResult !=null && refundAmtResult.containsKey("refundAmtSum")){
+//                    listSum.get(0).put("refundAmtSum", refundAmtResult.get("refundAmtSum").toString());
+//                }else {
+//                    listSum.get(0).put("refundAmtSum", "0.00");
+//                }
+
+                //按照油品名称
+                classes.setGroupBy("oilName");
+                classes.setStatus("1");
+                List<Map<String, String>> listSumGroupByOilName = stationClassStructureService.selectClassStructureSum(classes);
+
+                //按照支付方式
+                classes.setGroupBy("payType");
+                classes.setStatus("1");
+                List<Map<String, String>> listSumGroupByPayType = stationClassStructureService.selectClassStructureSum(classes);
+
+                //退款金额按照支付方式
+                classes.setGroupBy("payType");
+                classes.setStatus("3");
+                List<Map<String, String>> listSumGroupByPayTypeRefund = stationClassStructureService.selectClassStructureSum(classes);
+
+                //班结人、时间
+                classes.setGroupBy("timeAndMan");
+                List<Map<String, String>> timeList = stationClassStructureService.selectClassStructureSum(classes);
+
+                //返回POS结果
+                Map<String, Object> map = new HashMap();
+                map.put("listSumGroupByOilName", listSumGroupByOilName);
+                map.put("listSum", listSum);
+                map.put("listSumRefund", listSumRefund);
+                map.put("timeList", timeList);
+                map.put("listSumGroupByPayType", listSumGroupByPayType);
+                map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund);
+                resultData = ResultData.success(map);
             }else {
-                listSum.get(0).put("refundAmtSum", "0.00");
+                resultData = ResultData.error(CodeMsg.NO_CLASS_NO_INFO);
             }
-
-            //按照油品名称
-            classes.setGroupBy("oilName");
-            classes.setStatus("1");
-            List<Map<String, String>> listSumGroupByOilName = stationClassStructureService.selectClassStructureSum(classes);
-
-            //按照支付方式
-            classes.setGroupBy("payType");
-            classes.setStatus("1");
-            List<Map<String, String>> listSumGroupByPayType = stationClassStructureService.selectClassStructureSum(classes);
-
-            //退款金额按照支付方式
-//            classes.setGroupBy("payType");
-//            classes.setStatus("3");
-//            List<Map<String, String>> listSumGroupByPayTypeRefund = stationClassStructureService.selectClassStructureSum(classes);
-
-            //班结人、时间
-            classes.setGroupBy("timeAndMan");
-            List<Map<String, String>> timeList = stationClassStructureService.selectClassStructureSum(classes);
-
-            //返回POS结果
-            Map<String, Object> map = new HashMap();
-            map.put("listSumGroupByOilName", listSumGroupByOilName);
-            map.put("listSum", listSum);
-            map.put("timeList", timeList);
-            map.put("listSumGroupByPayType", listSumGroupByPayType);
-            //map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund);
-            resultData = ResultData.success(map);
+        }else {
+            resultData = ResultData.error(CodeMsg.PARAMS_NUll);
         }
         return gson.toJson(resultData);
     }
@@ -399,15 +408,15 @@ public class PosMachineController {
 
             //listSum 添加退款总金额  refundAmtSum
             order.setStatus("3");
-            Map<String, Object> refundAmtResult = payOrderService.selectRefundAmtSum(order);
-            if(refundAmtResult !=null && refundAmtResult.containsKey("refundAmtSum")){
-                String refundAmtSum = refundAmtResult.get("refundAmtSum").toString();
-                listSum.get(0).put("refundAmtSum", refundAmtSum);
-            }else {
-                listSum.get(0).put("refundAmtSum", "0.00");
-            }
-
-
+            //退款的汇总
+            List<Map> listSumRefund = payOrderService.selectSum(order);
+//            Map<String, Object> refundAmtResult = payOrderService.selectRefundAmtSum(order);
+//            if(refundAmtResult !=null && refundAmtResult.containsKey("refundAmtSum")){
+//                String refundAmtSum = refundAmtResult.get("refundAmtSum").toString();
+//                listSum.get(0).put("refundAmtSum", refundAmtSum);
+//            }else {
+//                listSum.get(0).put("refundAmtSum", "0.00");
+//            }
 
             //班结时间
             List<Map> timeList = new ArrayList<>();
@@ -427,17 +436,18 @@ public class PosMachineController {
             List<Map> listSumGroupByPayType = payOrderService.selectSum(order);
 
             //要班结订单退款金额按照支付方式汇总
-//            order.setGroupBy("payType");
-//            order.setStatus("3");
-//            List<Map> listSumGroupByPayTypeRefund = payOrderService.selectSum(order);
+            order.setGroupBy("payType");
+            order.setStatus("3");
+            List<Map> listSumGroupByPayTypeRefund = payOrderService.selectSum(order);
 
             //返回POS机数据
             Map<String, Object> map = new HashMap();
             map.put("listSumGroupByOilName", listSumGroupByOilName);
-            map.put("listSum", listSum);
+            map.put("listSum", listSum);                //支付汇总
+            map.put("listSumRefund", listSumRefund);    //退款汇总
             map.put("timeList", timeList);
             map.put("listSumGroupByPayType", listSumGroupByPayType);
-            //map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund);
+            map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund);
             resultData =ResultData.success(map);
         }else {
             resultData =ResultData.error(CodeMsg.PARAMS_NUll);

YijiaRestful/src/main/java/com/platform/yijia/utils/CodeMsg.java

@@ -40,6 +40,8 @@ public class CodeMsg {
     public static CodeMsg MORE_PERSONNAL = new CodeMsg(-6,"该油站或油枪未有绑定多个加油员");
     public static CodeMsg NO_ENABLE_COUPON = new CodeMsg(-5,"该油站暂未开启优惠券功能");
 
+    //POS班结
+    public static CodeMsg NO_CLASS_NO_INFO = new CodeMsg(-1,"无此班结号班结记录");
 
     //优惠券业务返回code
     public static CodeMsg COUPON_LOSE_EFFECTIVE = new CodeMsg(-2,"优惠券已无效");