POS班结，汇总；

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

@@ -2496,6 +2496,7 @@ public class PayController {
                         payOrder.setPayType("zfb");
                     }
                     payOrder.setAmt(Double.valueOf(amt));
+                    payOrder.setZfbAmt(Double.valueOf(amt));
                     payOrder.setDzkAmt(Double.valueOf("0"));
                     payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -287,34 +288,64 @@ public class PosMachineController {
         //返回结果集
         ResultData resultData = null;
         if(stationId !=null && classStructureNo !=null){
+            logger.info("查看POS上某个班结参数信息：油站ID："+ stationId.toString() + "班结好："+ classStructureNo);
             StationClassStructure classes =new StationClassStructure();
             classes.setStationId(stationId);
             classes.setClassStructureNo(classStructureNo);
+            StationClassesSummary scs = new StationClassesSummary();
+            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());
+            }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);
-//            if(timeList !=null && listSum.size() ==0){
-//                //第一次班结
-//                if(timeList.get(0).get("beginTime").equals("")){
-//                    PayOrder payOrder = new PayOrder();
-//                    payOrder.setStatus("1");
-//                    payOrder.setStationId(stationId);
-//                    PayOrder payOrderInfoMin = payOrderService.getPayOrderInfoMin(payOrder);
-//                    DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//                    //没有班结过：第一次班结
-//                    timeList.get(0).replace("beginTime", dateFormat.format(payOrderInfoMin.getPayDate()));
-//                }
-//            }
+
+            //返回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);
         }
         return gson.toJson(resultData);
@@ -334,22 +365,20 @@ public class PosMachineController {
         //返回结果集
         ResultData resultData = null;
         if(stationId !=null){
-            StationClassStructure classes =new StationClassStructure();
-            classes.setStationId(stationId);
-            //查询出上次班结，最后一条数据
-            StationClassStructure sss =stationClassStructureService.selectStationClassStructureMax(classes);
             String beginTime="";
             //当前时间
             Date date= new Date();
-            StationClassStructure classesStructure =new StationClassStructure();
-            classesStructure.setStationId(stationId);
             DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            if(sss != null){
+            //获取当油站是否有班结的记录存在
+            StationClassesSummary stationClassesSummary = new StationClassesSummary();
+            stationClassesSummary.setStationId(stationId);
+            List<StationClassesSummary> stationClassesSummaryList = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
+            if(stationClassesSummaryList != null && stationClassesSummaryList.size() >0){
                 //班结过
-                beginTime= dateFormat.format(sss.getClassStructureDate());
+                beginTime= dateFormat.format(stationClassesSummaryList.get(0).getEndDate());
             }else {
                 PayOrder payOrder = new PayOrder();
-                payOrder.setStatus("1");
+                //payOrder.setStatus("1");
                 payOrder.setStationId(stationId);
                 PayOrder payOrderInfoMin = payOrderService.getPayOrderInfoMin(payOrder);
                 //没有班结过：第一次班结
@@ -369,6 +398,18 @@ public class PosMachineController {
             order.setGroupBy("");
             List<Map> listSum = payOrderService.selectSum(order);
 
+            //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> timeList = new ArrayList<>();
             Map<String, String> m = new HashMap<>();
@@ -378,15 +419,26 @@ public class PosMachineController {
 
             //查询要班结订单总和按油品分类
             order.setGroupBy("oilName");
+            order.setStatus("1");
             List<Map> listSumGroupByOilName = payOrderService.selectSum(order);
+
             //查询要班结订单总和按支付方式
             order.setGroupBy("payType");
+            order.setStatus("1");
             List<Map> listSumGroupByPayType = 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("timeList", timeList);
             map.put("listSumGroupByPayType", listSumGroupByPayType);
+            map.put("listSumGroupByPayTypeRefund", listSumGroupByPayTypeRefund);
             resultData =ResultData.success(map);
         }else {
             resultData =ResultData.error(CodeMsg.PARAMS_NUll);
@@ -395,8 +447,6 @@ public class PosMachineController {
     }
 
 
-
-
     /*
      * pos机班结
      * @param stationClassStructure
@@ -408,325 +458,139 @@ public class PosMachineController {
     @Transactional
     public Map posClassStructure (@RequestBody StationClassStructure stationClassStructure) throws ParseException {
         Map map = new HashMap();
+        int i =0;       // i==1，表示班结成功； i==3，表示已班结；
         //获取当前班结油站
         Integer stationId=stationClassStructure.getStationId();
-        //String stationName=stationClassStructure.getStationName();
         String username = stationClassStructure.getClassStructureMan();
         logger.info("POS班结参数信息：油站ID："+ stationId.toString() + "班结人："+ username);
-        //根据油站查询出油站是否班结过，班结过就需要查询上次班结的时间
-        StationClassStructure classes =new StationClassStructure();
-        classes.setStationId(stationId);
-        //查询出上次班结，最后一条数据
-        StationClassStructure sss =stationClassStructureService.selectStationClassStructureMax(classes);
-        String beginTime="";
-        //当前时间
-        Date date= new Date();
-        StationClassStructure classesStructure =new StationClassStructure();
-        classesStructure.setStationId(stationId);
+
+        //查询上次班结时间的结束时间
+        StationClassesSummary stationClassesSummaryParam =new StationClassesSummary();
+        stationClassesSummaryParam.setStationId(stationId);
+        List<StationClassesSummary> stationClassesSummaryList = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummaryParam);
+
+        //本次班结开始时间
+        Date startDate = new Date();
+        PayOrder order=new PayOrder();
+        order.setStationId(stationId);
+        //order.setStatus("1");
+
+        //班结号
         DateFormat dFormat = new SimpleDateFormat("yyyyMMdd");
-        String no=dFormat.format(date);
-        classesStructure.setLikeClassStructureNo(no);
-        //查询班结信息中本日班结次数
-        StationClassStructure structure =stationClassStructureService.selectDistnctClassStructure(classesStructure);
-        if(structure!=null){
-            if(structure.getNum()==0){
-                no = no + "0"+1;
-            }else{
-                int num  = structure.getNum()+1;
-                if(num>0 && num<10){
-                    no = no + "0"+num;
-                }else{
-                    no = no +""+ num;
-                }
-            }
-        }
-        int i=0;
-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        if(sss!=null){
-            //获取上次班结时间
-            PayOrder order=new PayOrder();
-            order.setStationId(stationId);
-            order.setStatus("1");
-            beginTime= dateFormat.format(sss.getClassStructureDate());
-            order.setBeginTime(beginTime);
-            order.setEndTime( dateFormat.format(date));
-            List<PayOrder> list = payOrderService.selectPayOrderList(order);
-            for(PayOrder payOrder:list){
-                StationClassStructure stationclass =new StationClassStructure();
-                stationclass.setStationId(payOrder.getStationId());
-                stationclass.setStationName(payOrder.getStationName());
-                stationclass.setClassStartDate(dateFormat.parse(beginTime));
-                stationclass.setClassStructureMan(username);
-                stationclass.setClassStructureNo(no);
-                stationclass.setOilPirce(new BigDecimal(payOrder.getOilPirce()));
-                stationclass.setOilType(payOrder.getOilType());
-                stationclass.setClassStructureDate(date);
-                stationclass.setOrderNo(payOrder.getOrderNo());
-                stationclass.setOilGun(payOrder.getOilGun());
-                stationclass.setOilName(payOrder.getOilName());
-                stationclass.setConsumerId(payOrder.getConsumerId());
-                stationclass.setConsumer(payOrder.getConsumer());
-                stationclass.setAmt(new BigDecimal(payOrder.getAmt()));
-                if(payOrder.getReceivableAmt()!=null){
-                    stationclass.setReceivableAmt(new BigDecimal(payOrder.getReceivableAmt()));
-                }else{
-                    stationclass.setReceivableAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getReceivedAmt()!=null){
-                    stationclass.setReceivedAmt(new BigDecimal(payOrder.getReceivedAmt()));
-                }else{
-                    stationclass.setReceivedAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDiscountAmt()!=null){
-                    stationclass.setDiscountAmt(new BigDecimal(payOrder.getDiscountAmt()));
-                }else{
-                    stationclass.setDiscountAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDiscountCouponAmt()!=null){
-                    stationclass.setDiscountCouponAmt(new BigDecimal(payOrder.getDiscountCouponAmt()));
-                }else{
-                    stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getWxAmt()!=null){
-                    stationclass.setWxAmt(new BigDecimal(payOrder.getWxAmt()));
-                }else{
-                    stationclass.setWxAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getZfbAmt()!=null){
-                    stationclass.setZfbAmt(new BigDecimal(payOrder.getZfbAmt()));
-                }else{
-                    stationclass.setZfbAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getPosAmt()!=null){
-                    stationclass.setPosAmt(new BigDecimal(payOrder.getPosAmt()));
-                }else{
-                    stationclass.setPosAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getXjAmt()!=null){
-                    stationclass.setXjAmt(new BigDecimal(payOrder.getXjAmt()));
-                }else{
-                    stationclass.setXjAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDidiAppAmt()!=null){
-                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getDidiAppAmt()));
-                }else{
-                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getTyAppAmt()!=null){
-                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getTyAppAmt()));
-                }else{
-                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getOtherAmt()!=null){
-                    stationclass.setOtherAmt(new BigDecimal(payOrder.getOtherAmt()));
-                }else{
-                    stationclass.setOtherAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDzkAmt()!=null){
-                    stationclass.setDzkAmt(new BigDecimal(payOrder.getDzkAmt()));
-                }else{
-                    stationclass.setDzkAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getMemberAmt()!=null){
-                    stationclass.setMemberAmt(new BigDecimal(payOrder.getMemberAmt()));
-                }else{
-                    stationclass.setMemberAmt(BigDecimal.valueOf(0));
-                }
-                stationclass.setOrderLiters(new BigDecimal(payOrder.getOrderLiters()));
-                stationclass.setPayWay(payOrder.getPayWay());
-                stationclass.setPayType(payOrder.getPayType());
-                stationclass.setPayDate(payOrder.getPayDate());
-                stationclass.setOilPersonnel(payOrder.getOilPersonnel());
-                stationclass.setOilPersonnelId(payOrder.getOilPersonnelId());
-                stationclass.setOrderType(payOrder.getOrderType());
-                if(payOrder.getPrintCount()!=null){
-                    stationclass.setPrintNum(payOrder.getPrintCount());
-                }else{
-                    stationclass.setPrintNum(Integer.valueOf("0"));
+        String no=dFormat.format(new Date());
+
+        //判断当前油站是否有班结记录：
+        if(stationClassesSummaryList !=null && stationClassesSummaryList.size() >0){
+            //如果有记录，则当前油站最后一次的班结时间结束时间为新班结的开始时间；
+            startDate = stationClassesSummaryList.get(0).getEndDate();
+            //班结的班号
+            String classesNo = stationClassesSummaryList.get(0).getClassesNo();
+            //获取最新一笔订单的支付时间
+            List<PayOrder> payOrderList = payOrderService.selectPayOrderListFormater(order);
+            Timestamp payDate = payOrderList.get(0).getPayDate();
+            if(startDate.compareTo(new Date(payDate.getTime())) != -1){
+                //如果最近一次班结时间 < 油站的最新一笔订单的支付时间，则说明已班结；
+                i = 3;
+            }else {
+                //开始班结
+                //获取要班结的汇总数据
+                stationClassStructure.setClassStartDate(startDate);
+                stationClassStructure.setClassStructureDate(new Date());
+                stationClassStructure.setStatus("1");
+                StationClassStructure classSumResult = stationClassStructureService.selectSummyByPayOrder(stationClassStructure);
+                if(classSumResult !=null){
+                    StationClassesSummary staClassSum =new StationClassesSummary();
+                    staClassSum.setStationId(stationId);            //班结站点
+                    staClassSum.setClassesMan(username);            //班结人
+                    staClassSum.setEndDate(new Date());             //班结结束时间
+                    staClassSum.setStartDate(startDate);            //班结开始时间
+                    //班结号
+                    String substring = classesNo.substring(0,8);
+                    if(substring.equals(no)){
+                        String substring1 = classesNo.substring(8);
+                        int ii = Integer.parseInt(substring1);
+                        ii = ii+1;
+                        if(ii < 10){
+                            classesNo = substring + "0" + ii;
+                        }else {
+                            classesNo = substring + ii;
+                        }
+                    }else {
+                        classesNo = no + "01";
+                    }
+                    staClassSum.setClassesNo(classesNo);                    //班结号
+
+                    //汇总的数据
+                    staClassSum.setDiscountAmt(classSumResult.getDiscountAmt());        //优惠总金额
+                    staClassSum.setAmt(classSumResult.getAmt());                        //实际支付总金额
+                    staClassSum.setDzkAmt(classSumResult.getDzkAmt());                  //电子卡支付总金额
+                    staClassSum.setOrderNum(classSumResult.getNum());                   //支付订单总数
+                    staClassSum.setPrintNum(classSumResult.getPrintNum());              //小票打印总数量
+                    staClassSum.setWxAmt(classSumResult.getWxAmt());                    //微信支付总金额
+                    staClassSum.setZfbAmt(classSumResult.getZfbAmt());                  //支付宝支付总金额
+                    staClassSum.setSaleLiters(classSumResult.getOrderLiters());         //加油总升数
+                    staClassSum.setSaleAmt(classSumResult.getReceivableAmt());          //应收总金额
+                    staClassSum.setRefundAmt(new BigDecimal("0.00"));               //退款总金额
+                    //获取退款总金额
+                    stationClassStructure.setStatus("3");
+                    StationClassStructure classSumRefundResult = stationClassStructureService.selectSummyByPayOrder(stationClassStructure);
+                    if(classSumRefundResult !=null){
+                        staClassSum.setRefundAmt(classSumRefundResult.getAmt());
+                    }
+                    i=stationClassesSummaryService.insertStationClassesSummary(staClassSum);
                 }
-                i= stationClassStructureService.insertStationClassStructure(stationclass);
             }
-        }else{
-            //初次班结 班结时间默认为当前时间，班结人username
-            //根据班结时间查询订单
-            PayOrder order=new PayOrder();
-            order.setStationId(stationId);
-            order.setStatus("1");
-            //获取第一个最早时间的订单
+        }else {
+            //如果没有记录，则开始班结的时间为当前油站的第一笔订单的支付时间；
             PayOrder payOrderInfoMin = payOrderService.getPayOrderInfoMin(order);
-            //没有班结过：第一次班结获取第一个订单的下单时间
-            beginTime =dateFormat.format(payOrderInfoMin.getPayDate());
-            order.setBeginTime(beginTime);
-            order.setEndTime(dateFormat.format(date));
-
-            List<PayOrder> list = payOrderService.selectPayOrderList(order);
-            for(PayOrder payOrder:list){
-                StationClassStructure stationclass =new StationClassStructure();
-                stationclass.setClassStartDate(payOrderInfoMin.getPayDate());
-                stationclass.setStationId(payOrder.getStationId());
-                stationclass.setStationName(payOrder.getStationName());
-                stationclass.setClassStructureMan(username);
-                stationclass.setClassStructureDate(date);
-                stationclass.setClassStructureNo(no);
-                stationclass.setOrderNo(payOrder.getOrderNo());
-                stationclass.setOilGun(payOrder.getOilGun());
-                stationclass.setOilName(payOrder.getOilName());
-                stationclass.setOilPirce(new BigDecimal(payOrder.getOilPirce()));
-                stationclass.setOilType(payOrder.getOilType());
-                stationclass.setConsumerId(payOrder.getConsumerId());
-                stationclass.setConsumer(payOrder.getConsumer());
-                stationclass.setAmt(new BigDecimal(payOrder.getAmt()));
-                if(payOrder.getReceivableAmt()!=null){
-                    stationclass.setReceivableAmt(new BigDecimal(payOrder.getReceivableAmt()));
-                }else{
-                    stationclass.setReceivableAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getReceivedAmt()!=null){
-                    stationclass.setReceivedAmt(new BigDecimal(payOrder.getReceivedAmt()));
-                }else{
-                    stationclass.setReceivedAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDiscountAmt()!=null){
-                    stationclass.setDiscountAmt(new BigDecimal(payOrder.getDiscountAmt()));
-                }else{
-                    stationclass.setDiscountAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDiscountCouponAmt()!=null){
-                    stationclass.setDiscountCouponAmt(new BigDecimal(payOrder.getDiscountCouponAmt()));
-                }else{
-                    stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getWxAmt()!=null){
-                    stationclass.setWxAmt(new BigDecimal(payOrder.getWxAmt()));
-                }else{
-                    stationclass.setWxAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getZfbAmt()!=null){
-                    stationclass.setZfbAmt(new BigDecimal(payOrder.getZfbAmt()));
-                }else{
-                    stationclass.setZfbAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getPosAmt()!=null){
-                    stationclass.setPosAmt(new BigDecimal(payOrder.getPosAmt()));
-                }else{
-                    stationclass.setPosAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getXjAmt()!=null){
-                    stationclass.setXjAmt(new BigDecimal(payOrder.getXjAmt()));
-                }else{
-                    stationclass.setXjAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDidiAppAmt()!=null){
-                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getDidiAppAmt()));
-                }else{
-                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getTyAppAmt()!=null){
-                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getTyAppAmt()));
-                }else{
-                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getOtherAmt()!=null){
-                    stationclass.setOtherAmt(new BigDecimal(payOrder.getOtherAmt()));
-                }else{
-                    stationclass.setOtherAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getDzkAmt()!=null){
-                    stationclass.setDzkAmt(new BigDecimal(payOrder.getDzkAmt()));
-                }else{
-                    stationclass.setDzkAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getMemberAmt()!=null){
-                    stationclass.setMemberAmt(new BigDecimal(payOrder.getMemberAmt()));
-                }else{
-                    stationclass.setMemberAmt(BigDecimal.valueOf(0));
-                }
-                if(payOrder.getOrderLiters() !=null){
-                    stationclass.setOrderLiters(new BigDecimal(payOrder.getOrderLiters()));
-                }else {
-                    stationclass.setOrderLiters(new BigDecimal(0));
-                }
-                stationclass.setPayWay(payOrder.getPayWay());
-                stationclass.setPayType(payOrder.getPayType());
-                stationclass.setPayDate(payOrder.getPayDate());
-                stationclass.setOilPersonnel(payOrder.getOilPersonnel());
-                stationclass.setOilPersonnelId(payOrder.getOilPersonnelId());
-                stationclass.setOrderType(payOrder.getOrderType());
-                if(payOrder.getPrintCount()!=null){
-                    stationclass.setPrintNum(payOrder.getPrintCount());
-                }else{
-                    stationclass.setPrintNum(Integer.valueOf("0"));
-                }
-                i= stationClassStructureService.insertStationClassStructure(stationclass);
+            if(payOrderInfoMin !=null){
+                //获取第一个最早时间的订单
+                startDate = payOrderInfoMin.getPayDate();
+            }
+            StationClassesSummary staClassSum =new StationClassesSummary();
+            staClassSum.setStationId(stationId);            //班结站点
+            staClassSum.setClassesMan(username);            //班结人
+            staClassSum.setEndDate(new Date());             //班结结束时间
+            staClassSum.setStartDate(startDate);            //班结开始时间
+            staClassSum.setClassesNo(no+"01");              //班结号
+
+            //获取要班结的汇总数据
+            stationClassStructure.setClassStartDate(startDate);
+            stationClassStructure.setClassStructureDate(new Date());
+            stationClassStructure.setStatus("1");
+            StationClassStructure classSumResult = stationClassStructureService.selectSummyByPayOrder(stationClassStructure);
+            if(classSumResult !=null){
+                //汇总的数据
+                staClassSum.setDiscountAmt(classSumResult.getDiscountAmt());        //优惠总金额
+                staClassSum.setAmt(classSumResult.getAmt());                        //实际支付总金额
+                staClassSum.setDzkAmt(classSumResult.getDzkAmt());                  //电子卡支付总金额
+                staClassSum.setOrderNum(classSumResult.getNum());                   //支付订单总数
+                staClassSum.setPrintNum(classSumResult.getPrintNum());              //小票打印总数量
+                staClassSum.setWxAmt(classSumResult.getWxAmt());                    //微信支付总金额
+                staClassSum.setZfbAmt(classSumResult.getZfbAmt());                  //支付宝支付总金额
+                staClassSum.setSaleLiters(classSumResult.getOrderLiters());         //加油总升数
+                staClassSum.setSaleAmt(classSumResult.getReceivableAmt());          //应收总金额
+
+                staClassSum.setRefundAmt(new BigDecimal("0.00"));               //退款总金额
+                //获取退款总金额
+                stationClassStructure.setStatus("3");
+                StationClassStructure classSumRefundResult = stationClassStructureService.selectSummyByPayOrder(stationClassStructure);
+                if(classSumRefundResult !=null){
+                    staClassSum.setRefundAmt(classSumRefundResult.getAmt());
+                }
+
+                i=stationClassesSummaryService.insertStationClassesSummary(staClassSum);
             }
         }
-        StationClassStructure scs =new StationClassStructure();
-        scs.setClassStructureNo(no);
-        scs.setStationId(stationId);
-        //汇总班结数据将汇总的数据插入到汇总数据中
-        StationClassStructure stationclass = stationClassStructureService.selectSummyClassStructure(scs);
-        if(stationclass!=null){
-            StationClassesSummary stationClassesSummary =new StationClassesSummary();
-            stationClassesSummary.setClassesNo(stationclass.getClassStructureNo());
-            if(stationclass.getClassStartDate()!=null){
-                stationClassesSummary.setStartDate(stationclass.getClassStartDate());
-            }
-            if(stationclass.getClassStructureDate()!=null){
-                stationClassesSummary.setEndDate(stationclass.getClassStructureDate());
-            }
-            //stationClassesSummary.setStationName(stationclass.getStationName());
-            if(stationclass.getStationId()!=null){
-                stationClassesSummary.setStationId(stationclass.getStationId());
-            }
-            if(stationclass.getNum()!=null){
-                stationClassesSummary.setOrderNum(Integer.valueOf(stationclass.getNum()));
-            }
-            if(stationclass.getPrintNum()!=null){
-                stationClassesSummary.setPrintNum(stationclass.getPrintNum());
-            }else {
-                stationClassesSummary.setPrintNum(Integer.valueOf(0));
-            }
-            if(stationclass.getOrderLiters()!=null){
-                stationClassesSummary.setSaleLiters(stationclass.getOrderLiters());
-            }
-            if(stationclass.getReceivableAmt()!=null){
-                stationClassesSummary.setSaleAmt(stationclass.getReceivableAmt());
-            }
-            if(stationclass.getDzkAmt()!=null){
-                stationClassesSummary.setDzkAmt(stationclass.getDzkAmt());
-            }else{
-                stationClassesSummary.setDzkAmt(BigDecimal.valueOf(0));
-            }
-            if(stationclass.getZfbAmt()!=null){
-                stationClassesSummary.setZfbAmt(stationclass.getZfbAmt());
-            }else{
-                stationClassesSummary.setZfbAmt(BigDecimal.valueOf(0));
-            }
-
-            if(stationclass.getWxAmt()!=null){
-                stationClassesSummary.setWxAmt(stationclass.getWxAmt());
-            }else{
-                stationClassesSummary.setWxAmt(BigDecimal.valueOf(0));
-            }
-            if(stationclass.getAmt() !=null){
-                stationClassesSummary.setAmt(stationclass.getAmt());
-            }else {
-                stationClassesSummary.setAmt(BigDecimal.valueOf(0));
-            }
-            if(stationclass.getDiscountAmt() !=null){
-                stationClassesSummary.setDiscountAmt(stationclass.getDiscountAmt());
-            }else {
-                stationClassesSummary.setDiscountAmt(BigDecimal.valueOf(0));
-            }
-            stationClassesSummary.setClassesMan(stationclass.getClassStructureMan());
-            i=stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary);
-            if(i==1){
-                map.put("retCode","0");
-                map.put("msg","班结成功");
-            }
-        }else{
+        if(i == 1){
+            map.put("retCode","0");
+            map.put("msg","班结成功");
+        }else if(i== 3){
             map.put("retCode","-1");
             map.put("msg","已班结");
+        }else {
+            map.put("retCode","-2");
+            map.put("msg","班结失败");
         }
         return map;
     }

YijiaRestful/src/main/java/com/platform/yijia/dao/PayOrderMapper.java

@@ -15,6 +15,9 @@ public interface PayOrderMapper {
     //根据订单号查询订单
     PayOrder selectOrderInfoByOrdNo(String orderNo);
 
+    //获取退款得总金额
+    Map<String, Object> selectRefundAmtSum(PayOrder payOrder);
+
     //获取系统支付类型
     List<PayType> selectPayTypeList();
 

YijiaRestful/src/main/java/com/platform/yijia/dao/StationClassStructureMapper.java

@@ -16,6 +16,9 @@ import java.util.Map;
 public interface StationClassStructureMapper
 {
 
+    //从订单表汇总数据
+    StationClassStructure selectSummyByPayOrder(StationClassStructure stationClassStructure);
+
     //批量插入
     int insertStationClassStructureBatch(@Param("stationClassStructureList") List<StationClassStructure>  stationClassStructureList);
 

YijiaRestful/src/main/java/com/platform/yijia/pojo/StationClassStructure.java

@@ -154,6 +154,11 @@ public class StationClassStructure {
     /** 客户等级 */
     private String customerGrade;
 
+    /**退款金额**/
+    private BigDecimal refundAmt;
+
+    private String status;
+
 
     /**
      * 出参

YijiaRestful/src/main/java/com/platform/yijia/pojo/StationClassesSummary.java

@@ -63,6 +63,9 @@ public class StationClassesSummary
     /** 班结人 */
     private String classesMan;
 
+    /**退款金额**/
+    private BigDecimal refundAmt;
+
     private List<String> stationIdList;
 
 }

YijiaRestful/src/main/java/com/platform/yijia/service/IStationClassStructureService.java

@@ -16,6 +16,9 @@ import java.util.Map;
 public interface IStationClassStructureService
 {
 
+    //从订单表汇总数据
+    StationClassStructure selectSummyByPayOrder(StationClassStructure stationClassStructure);
+
     //批量插入
     int insertStationClassStructureBatch(@Param("stationClassStructureList") List<StationClassStructure>  stationClassStructureList);
 

YijiaRestful/src/main/java/com/platform/yijia/service/PayOrderService.java

@@ -20,6 +20,9 @@ public interface PayOrderService {
     //获取订单列表已转化汉字支付方式的
     List<PayOrder>  selectPayOrderListFormater(PayOrder payOrder);
 
+    //获取退款得总金额
+    Map<String, Object> selectRefundAmtSum(PayOrder payOrder);
+
     //查询POS机近七天数据
     List<Map<String, Object>> selectPosRecentlySevenData(PayOrder payOrder);
 

YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -41,6 +41,12 @@ public class PayOrderServiceImpl implements PayOrderService {
         return payOrderMapper.selectPayOrderListFormater(payOrder);
     }
 
+    //获取退款得总金额
+    @Override
+    public Map<String, Object> selectRefundAmtSum(PayOrder payOrder) {
+        return payOrderMapper.selectRefundAmtSum(payOrder);
+    }
+
     //获取POS机昨天数据
     @Override
     public Map<String, Object> selectPosYesterDayData(PayOrder payOrder) {

YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationClassStructureServiceImpl.java

@@ -25,6 +25,12 @@ public class StationClassStructureServiceImpl implements IStationClassStructureS
     @Resource
     private StationClassStructureMapper stationClassStructureMapper;
 
+    //从订单表汇总数据
+    @Override
+    public StationClassStructure selectSummyByPayOrder(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.selectSummyByPayOrder(stationClassStructure);
+    }
+
     //批量插入
     @Override
     public int insertStationClassStructureBatch(@Param("stationClassStructureList") List<StationClassStructure>  stationClassStructureList) {

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -147,6 +147,30 @@
             order_no =#{ordNo}
     </select>
 
+    <!--根据订单号查询订单信息-->
+    <select id="selectRefundAmtSum" parameterType="com.platform.yijia.pojo.PayOrder" resultType="Map">
+        SELECT
+            SUM(IFNULL(amt, 0)) AS refundAmtSum
+        FROM
+            pay_order
+        <where>
+            <if test="stationId !=null">
+                station_id= #{stationId}
+            </if>
+            <if test="status !=null">
+                AND status= #{status}
+            </if>
+            <if test="beginTime !=null and beginTime !=''">
+                AND pay_date &gt;= #{beginTime}
+            </if>
+            <if test="endTime !=null">
+                AND pay_date &lt; #{endTime}
+            </if>
+        </where>
+    </select>
+
+
+
 
   <sql id="Base_Column_List_oilName">
         SELECT
@@ -393,9 +417,9 @@
       <if test="stationId !=null">
         station_id= #{stationId}
       </if>
-      <if test="status !=null">
-        AND status= #{status}
-      </if>
+<!--      <if test="status !=null">-->
+        AND (status= "1" OR status ="3")
+<!--      </if>-->
     </where>
       ORDER BY  pay_date ASC LIMIT 0,1
   </select>
@@ -1174,6 +1198,9 @@
         <if test="wxAmt != null">
             wx_amt = #{wxAmt,jdbcType=DOUBLE},
         </if>
+        <if test="zfbAmt != null">
+            zfb_amt = #{zfbAmt,jdbcType=DOUBLE},
+        </if>
         <if test="discountAmt != null">
             discount_amt = #{discountAmt,jdbcType=DOUBLE},
         </if>

YijiaRestful/src/main/resources/mapper/StationClassStructureMapper.xml

@@ -52,8 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wxNum"    column="wx_num"    />
         <result property="zfbNum"    column="zfb_num"    />
         <result property="xjNum"    column="xj_num"    />
+        <result property="refundAmt"    column="refund_amt"    />
     </resultMap>
 
+    <!--根据班结号、油站ID：获取班结人要班结的订单总和信息-->
     <select id="selectClassStructureSum" parameterType="com.platform.yijia.pojo.StationClassStructure" resultType="Map">
         <if test="groupBy !=null and groupBy =='oilName'">
             <include refid="Base_Column_List_oilName"/>
@@ -61,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="groupBy !=null and groupBy =='payType'">
             <include refid="Base_Column_List_payType"/>
         </if>
+<!--        <if test="groupBy !=null and groupBy =='payTypeRefund'">-->
+<!--            <include refid="Base_Column_List_payType_refund"/>-->
+<!--        </if>-->
         <if test="groupBy ==''">
             <include refid="Base_Column_List_NoGroupBy"/>
         </if>
@@ -78,15 +83,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SUM(IFNULL(T2.discount_amt,0))        AS discountAmtSum,
             SUM(IFNULL(T2.amt,0))                 AS amtSum
         FROM         sys_dict_data                AS T1
-        LEFT JOIN    station_class_structure      AS T2   ON T1.dict_label = T2.oil_name
+        LEFT JOIN    pay_order                    AS T2   ON T1.dict_label = T2.oil_name
         <if test="stationId !=null">
             AND T2.station_id= #{stationId}
         </if>
-        <if test="classStructureNo !=null">
-            AND T2.class_structure_no= #{classStructureNo}
-        </if>
         WHERE
             T1.dict_type ="oil_name"
+            <if test="status != null ">
+                AND T2.status = #{status}
+            </if>
+            <if test="classStartDate != null "><!-- 开始时间检索 -->
+                AND T2.pay_date &gt;= #{classStartDate}
+            </if>
+            <if test="classStructureDate != null"><!-- 结束时间检索 -->
+                AND T2.pay_date &lt; #{classStructureDate}
+            </if>
         GROUP BY T1.dict_label
         ORDER BY amtSum DESC
     </sql>
@@ -99,18 +110,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SUM(IFNULL(T2.discount_amt,0))        AS discountAmtSum,
             SUM(IFNULL(T2.amt,0))                 AS amtSum
         FROM         sys_dict_data                AS T1
-        LEFT JOIN    station_class_structure      AS T2   ON T1.dict_value = T2.pay_type
+        LEFT JOIN    pay_order                    AS T2   ON T1.dict_value = T2.pay_type
         <if test="stationId !=null">
             AND T2.station_id= #{stationId}
         </if>
-        <if test="classStructureNo !=null">
-            AND T2.class_structure_no= #{classStructureNo}
-        </if>
         WHERE
             T1.dict_type ="pay_type"
+            <if test="status != null ">
+                AND T2.status = #{status}
+            </if>
+            <if test="classStartDate != null "><!-- 开始时间检索 -->
+                AND T2.pay_date &gt;= #{classStartDate}
+            </if>
+            <if test="classStructureDate != null"><!-- 结束时间检索 -->
+                AND T2.pay_date &lt; #{classStructureDate}
+            </if>
         GROUP BY T1.dict_label
         ORDER BY amtSum DESC
     </sql>
+
+<!--    <sql id="Base_Column_List_payType_refund">-->
+<!--        SELECT-->
+<!--            T1.dict_label                         AS payType,-->
+<!--            COUNT(T2.order_no)                    AS orderSum,-->
+<!--            SUM(IFNULL(T2.order_liters,0))        AS orderLitersSum,-->
+<!--            SUM(IFNULL(T2.receivable_amt,0))      AS receivableAmtSum,-->
+<!--            SUM(IFNULL(T2.discount_amt,0))        AS discountAmtSum,-->
+<!--            SUM(IFNULL(T2.amt,0))                 AS amtSum-->
+<!--        FROM         sys_dict_data                AS T1-->
+<!--        LEFT JOIN    pay_order                    AS T2   ON T1.dict_value = T2.pay_type-->
+<!--            <if test="stationId !=null">-->
+<!--                AND T2.station_id= #{stationId}-->
+<!--            </if>-->
+<!--        WHERE-->
+<!--            T1.dict_type ="pay_type"-->
+<!--            <if test="status != null ">-->
+<!--                AND T2.status = #{status}-->
+<!--            </if>-->
+<!--            <if test="classStartDate != null ">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
+<!--                AND T2.pay_date &gt;= #{classStartDate}-->
+<!--            </if>-->
+<!--            <if test="classStructureDate != null">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
+<!--                AND T2.pay_date &lt; #{classStructureDate}-->
+<!--            </if>-->
+<!--        GROUP BY T1.dict_label-->
+<!--        ORDER BY amtSum DESC-->
+<!--    </sql>-->
+
+
     <sql id="Base_Column_List_NoGroupBy">
         SELECT
             COUNT(T2.order_no)                  AS orderSum,
@@ -119,35 +166,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SUM(IFNULL(T2.discount_amt,0))      AS discountAmtSum,
             SUM(IFNULL(T2.amt,0))               AS amtSum,
             SUM(IFNULL(T2.received_amt,0))      AS receivedAmtSum,
-            SUM(IFNULL(T2.print_num,0))         AS printCountSum
+            SUM(IFNULL(T2.print_count,0))       AS printCountSum
         FROM
-            station_class_structure             AS T2
+                            pay_order        AS T2
         <where>
             <if test="stationId !=null">
                 T2.station_id= #{stationId}
             </if>
-            <if test="classStructureNo !=null">
-                AND T2.class_structure_no= #{classStructureNo}
+            <if test="status != null ">
+                AND T2.status = #{status}
+            </if>
+            <if test="classStartDate != null "><!-- 开始时间检索 -->
+                AND T2.pay_date &gt;= #{classStartDate}
+            </if>
+            <if test="classStructureDate != null"><!-- 结束时间检索 -->
+                AND T2.pay_date &lt; #{classStructureDate}
             </if>
         </where>
     </sql>
     <sql id="Base_Column_List_timeAndMan">
         SELECT
-            T2.class_structure_no                                                    AS classStructureNo,
-            IFNULL(DATE_FORMAT(T2.class_start_date, '%Y-%m-%d %H:%i:%s'), "")        AS beginTime,
-            DATE_FORMAT(T2.class_structure_date, '%Y-%m-%d %H:%i:%s')                AS endTime,
-            T2.class_structure_man                                                   AS classStructureMan
+            T2.classes_no                                                            AS classStructureNo,
+            IFNULL(DATE_FORMAT(T2.start_date, '%Y-%m-%d %H:%i:%s'), "")              AS beginTime,
+            DATE_FORMAT(T2.end_date, '%Y-%m-%d %H:%i:%s')                            AS endTime,
+            T2.classes_man                                                           AS classStructureMan
         FROM
-            station_class_structure                                                  AS T2
+            station_classes_summary                                                  AS T2
         <where>
             <if test="stationId !=null">
                 T2.station_id= #{stationId}
             </if>
             <if test="classStructureNo !=null">
-                AND T2.class_structure_no= #{classStructureNo}
+                AND T2.classes_no= #{classStructureNo}
             </if>
+<!--            <if test="classStartDate != null ">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
+<!--                AND T2.pay_date &gt;= #{classStartDate}-->
+<!--            </if>-->
+<!--            <if test="classStructureDate != null">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
+<!--                AND T2.pay_date &lt; #{classStructureDate}-->
+<!--            </if>-->
         </where>
-        ORDER BY  T2.class_structure_no ASC LIMIT 0,1
+        ORDER BY  T2.classes_no ASC LIMIT 0,1
     </sql>
 
 
@@ -246,6 +305,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="likeClassStructureNo != null  and likeClassStructureNo != ''">  and class_structure_no like concat( #{likeClassStructureNo}, '%') </if>
         </where>
     </select>
+
+    <!--汇总班结数据生成班结记录-->
+    <select id="selectSummyByPayOrder" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT
+            COUNT(IFNULL(order_no,0))             AS num,
+            SUM(IFNULL(order_liters,0))           AS order_liters,
+            SUM(IFNULL(amt,0))                    AS amt,
+            SUM(IFNULL(receivable_amt,0))         AS receivable_amt,
+            SUM(IFNULL(wx_amt,0))                 AS wx_amt,
+            SUM(IFNULL(zfb_amt,0))                AS zfb_amt,
+            SUM(IFNULL(pos_amt,0))                AS pos_amt,
+            SUM(IFNULL(dzk_amt,0))                AS dzk_amt,
+            SUM(IFNULL(xj_amt,0))                 AS xj_amt,
+            SUM(IFNULL(other_amt,0))    		  AS other_amt,
+            SUM(IFNULL(print_count,0))            AS print_num,
+            SUM(IFNULL(discount_amt,0))           AS discount_amt
+        FROM pay_order
+        <where>
+            <if test="stationId != null and stationId != ''">
+                 station_id = #{stationId}
+            </if>
+            <if test="status != null and status != ''">
+                AND status = #{status}
+            </if>
+            <if test="classStartDate != null">
+                AND  pay_date &gt;= #{classStartDate}
+            </if>
+            <if test="classStructureDate != null">
+                AND pay_date &lt; #{classStructureDate}
+            </if>
+        </where>
+    </select>
+
+
     <!--根据班次号汇总班结数据-->
     <select id="selectSummyClassStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
         SELECT

YijiaRestful/src/main/resources/mapper/StationClassesSummaryMapper.xml

@@ -75,12 +75,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
             <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
             <if test="classesMan != null  and classesMan != ''"> and classes_man = #{classesMan}</if>
-            <if test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
-                AND date_format(end_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
-            </if>
-            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
-                AND date_format(end_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
-            </if>
+<!--            <if test="beginTime != null and beginTime != ''">&lt;!&ndash; 开始时间检索 &ndash;&gt;-->
+<!--                AND date_format(end_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')-->
+<!--            </if>-->
+<!--            <if test="endTime != null and endTime != ''">&lt;!&ndash; 结束时间检索 &ndash;&gt;-->
+<!--                AND date_format(end_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')-->
+<!--            </if>-->
         </where>
         order by id desc
     </select>
@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amt != null">amt,</if>
             <if test="discountAmt != null">discount_amt,</if>
             <if test="classesMan != null">classes_man,</if>
+            <if test="refundAmt != null">refund_amt,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="classesNo != null">#{classesNo},</if>
@@ -125,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="amt != null">#{amt},</if>
             <if test="discountAmt != null">#{discountAmt},</if>
             <if test="classesMan != null">#{classesMan},</if>
+            <if test="refundAmt != null">#{refundAmt},</if>
          </trim>
     </insert>
 

YijiaRestful/src/test/java/com/palatform/yijia/test.java

@@ -17,13 +17,22 @@ public class test {
 
     public static void main(String[] args) throws ParseException {
 
-        Date parse = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2021-09-27 00:05:25");
-        System.out.println(parse);
-
-        Date parse1 = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse("2021-09-27 00:05:25");
-        System.out.println(parse1);
-
-        new SimpleDateFormat("yyyyMMddHHmmss").parse("2021-09-27 00:05:25");
+        String classesNo = "2021101801";
+        String substring = classesNo.substring(0,8);
+        System.out.println(substring);
+        String substring1 = classesNo.substring(8);
+        System.out.println(substring1);
+        int i1 = Integer.parseInt(substring1);
+        i1 = i1+1;
+        System.out.println(i1);
+
+//        Date parse = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2021-09-27 00:05:25");
+//        System.out.println(parse);
+//
+//        Date parse1 = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").parse("2021-09-27 00:05:25");
+//        System.out.println(parse1);
+//
+//        new SimpleDateFormat("yyyyMMddHHmmss").parse("2021-09-27 00:05:25");
 
 
 //        String yyyyMMddhhmmss = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());