POS查询订单修改

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

@@ -218,7 +218,7 @@ public class PosMachineController {
             payOrder.setBeginTime(request.getBeginTime());
             payOrder.setEndTime(request.getEndTime());
             payOrder.setPayType(request.getPayType());
-            payOrder.setStatus("1");
+            payOrder.setStatus(request.getStatus());
             Map<String, Object> resultMap = new HashMap<>();
             //分页
             if(request.getPageNum() !=null && request.getPageSize() !=null){
@@ -495,7 +495,7 @@ public class PosMachineController {
             //班结的班号
             String classesNo = stationClassesSummaryList.get(0).getClassesNo();
             //获取最新一笔订单的支付时间
-            List<PayOrder> payOrderList = payOrderService.selectPayOrderListFormater(order);
+            List<PayOrder> payOrderList = payOrderService.selectPayOrderList(order);
             Timestamp payDate = payOrderList.get(0).getPayDate();
             if(startDate.compareTo(new Date(payDate.getTime())) != -1){
                 //如果最近一次班结时间 < 油站的最新一笔订单的支付时间，则说明已班结；
@@ -611,237 +611,237 @@ public class PosMachineController {
      * @return
      * @throws ParseException
      */
-    @RequestMapping (value = "/posClassStructureNew", method = RequestMethod.POST)
-    @ResponseBody
-    @Transactional
-    public Map posClassStructureNew (@RequestBody StationClassStructure stationClassStructure) throws ParseException {
-        Map map = new HashMap();
-        //获取当前班结油站
-        Integer stationId=stationClassStructure.getStationId();
-        String username = stationClassStructure.getClassStructureMan();
-        //根据油站查询出油站是否班结过，班结过就需要查询上次班结的时间
-        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 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");
-        PayOrder order=new PayOrder();
-        order.setStationId(stationId);
-        order.setStatus("1");
-        PayOrder payOrderInfoMin = new PayOrder();
-        if(sss!=null){
-            //获取上次班结时间
-            beginTime= dateFormat.format(sss.getClassStructureDate());
-            order.setBeginTime(beginTime);
-            order.setEndTime( dateFormat.format(date));
-        }else{
-            //获取第一个最早时间的订单
-            payOrderInfoMin = payOrderService.getPayOrderInfoMin(order);
-            //初次班结 班结时间默认为当前时间，班结人username
-            //根据班结时间查询订单
-            //没有班结过：第一次班结获取第一个订单的下单时间
-            beginTime =dateFormat.format(payOrderInfoMin.getPayDate());
-            order.setBeginTime(beginTime);
-            order.setEndTime(dateFormat.format(date));
-        }
-        List<PayOrder> orderList = payOrderService.selectPayOrderList(order);
-        //批量插入要班结的订单
-        List<StationClassStructure>  stationClassStructureList= new ArrayList<>();
-        for (PayOrder  payOrder: orderList){
-            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.setOrderType(payOrder.getOrderType());
-            if(payOrder.getPrintCount()!=null){
-                stationclass.setPrintNum(payOrder.getPrintCount());
-            }else{
-                stationclass.setPrintNum(Integer.valueOf("0"));
-            }
-            stationClassStructureList.add(stationclass);
-        }
-        int insertSize = stationClassStructureService.insertStationClassStructureBatch(stationClassStructureList);
-        if(insertSize == orderList.size()){
-            StationClassStructure scs =new StationClassStructure();
-            scs.setClassStructureNo(no);
-            //汇总班结数据将汇总的数据插入到汇总数据中
-            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{
-                map.put("retCode","-1");
-                map.put("msg","已班结");
-            }
-        }else {
-            map.put("retCode","-2");
-            map.put("msg","班结失败");
-        }
-        return map;
-    }
+//    @RequestMapping (value = "/posClassStructureNew", method = RequestMethod.POST)
+//    @ResponseBody
+//    @Transactional
+//    public Map posClassStructureNew (@RequestBody StationClassStructure stationClassStructure) throws ParseException {
+//        Map map = new HashMap();
+//        //获取当前班结油站
+//        Integer stationId=stationClassStructure.getStationId();
+//        String username = stationClassStructure.getClassStructureMan();
+//        //根据油站查询出油站是否班结过，班结过就需要查询上次班结的时间
+//        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 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");
+//        PayOrder order=new PayOrder();
+//        order.setStationId(stationId);
+//        order.setStatus("1");
+//        PayOrder payOrderInfoMin = new PayOrder();
+//        if(sss!=null){
+//            //获取上次班结时间
+//            beginTime= dateFormat.format(sss.getClassStructureDate());
+//            order.setBeginTime(beginTime);
+//            order.setEndTime( dateFormat.format(date));
+//        }else{
+//            //获取第一个最早时间的订单
+//            payOrderInfoMin = payOrderService.getPayOrderInfoMin(order);
+//            //初次班结 班结时间默认为当前时间，班结人username
+//            //根据班结时间查询订单
+//            //没有班结过：第一次班结获取第一个订单的下单时间
+//            beginTime =dateFormat.format(payOrderInfoMin.getPayDate());
+//            order.setBeginTime(beginTime);
+//            order.setEndTime(dateFormat.format(date));
+//        }
+//        List<PayOrder> orderList = payOrderService.selectPayOrderList(order);
+//        //批量插入要班结的订单
+//        List<StationClassStructure>  stationClassStructureList= new ArrayList<>();
+//        for (PayOrder  payOrder: orderList){
+//            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.setOrderType(payOrder.getOrderType());
+//            if(payOrder.getPrintCount()!=null){
+//                stationclass.setPrintNum(payOrder.getPrintCount());
+//            }else{
+//                stationclass.setPrintNum(Integer.valueOf("0"));
+//            }
+//            stationClassStructureList.add(stationclass);
+//        }
+//        int insertSize = stationClassStructureService.insertStationClassStructureBatch(stationClassStructureList);
+//        if(insertSize == orderList.size()){
+//            StationClassStructure scs =new StationClassStructure();
+//            scs.setClassStructureNo(no);
+//            //汇总班结数据将汇总的数据插入到汇总数据中
+//            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{
+//                map.put("retCode","-1");
+//                map.put("msg","已班结");
+//            }
+//        }else {
+//            map.put("retCode","-2");
+//            map.put("msg","班结失败");
+//        }
+//        return map;
+//    }
 
 }

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

@@ -121,7 +121,7 @@
   </sql>
   <sql id="Base_Column_List_PayTypeName_Status">
     T1.order_id, T1.order_no, T1.oil_gun, T1.oil_name, T1.oil_pirce, T1.consumer_id, T1.consumer, T1.amt, T1.station_id,
-    CASE T1.status WHEN "1" THEN "已支付" ELSE "未支付" END AS status,
+    CASE T1.status WHEN "1" THEN "已支付" ELSE "已退款" END AS status,
     T1.order_liters, T1.pay_type, T1.pay_way, T1.pay_date, T1.oil_personnel, T1.oil_personnel_id, T1.created_date, T1.order_type, T1.station_name,
     T1.receivable_amt, T1.received_amt, T1.discount_amt, T1.discount_coupon_amt, T1.discount_coupon, T1.wx_amt,
     T1.zfb_amt, T1.pos_amt, T1.xj_amt, T1.didi_app_amt, T1.ty_app_amt, T1.other_amt, T1.dzk_amt, T1.score, T1.member_no, T1.member_amt,
@@ -368,9 +368,14 @@
             <if test="payType !=null and payType !=''">
                 AND T1.pay_type= #{payType}
             </if>
-            <if test="status !=null">
-                AND T1.status= #{status}
-            </if>
+            <choose>
+                <when test="status !=null and status !=''">
+                    AND T1.status= #{status}
+                </when>
+                <otherwise>
+                    AND (T1.status= "1" OR T1.status= "3")
+                </otherwise>
+            </choose>
             <if test="beginTime !=null and beginTime !=''">
                 AND T1.pay_date &gt;= #{beginTime}
             </if>
@@ -395,9 +400,9 @@
       <if test="payType !=null and payType !=''">
         AND pay_type= #{payType}
       </if>
-      <if test="status !=null">
-        AND status= #{status}
-      </if>
+<!--      <if test="status !=null">-->
+        AND (status= "1" OR status = "3")
+<!--      </if>-->
       <if test="beginTime !=null and beginTime !=''">
         AND pay_date &gt;= #{beginTime}
       </if>
@@ -405,6 +410,7 @@
         AND pay_date &lt; #{endTime}
       </if>
     </where>
+    ORDER BY pay_date DESC LIMIT 0,1
   </select>
 
   <!--初次班结 班结时间默认为当前时间订单信息-->