jk-GitHub-coder 4 роки тому
батько
коміт
b7bc8668b8
23 змінених файлів з 1984 додано та 7 видалено
  1. 3 2
      YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java
  2. 1 1
      YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java
  3. 392 0
      YijiaRestful/src/main/java/com/platform/yijia/controller/StationClassStructureController.java
  4. 112 0
      YijiaRestful/src/main/java/com/platform/yijia/controller/StationClassesSummaryController.java
  5. 5 0
      YijiaRestful/src/main/java/com/platform/yijia/dao/PayOrderMapper.java
  6. 121 0
      YijiaRestful/src/main/java/com/platform/yijia/dao/StationClassStructureMapper.java
  7. 62 0
      YijiaRestful/src/main/java/com/platform/yijia/dao/StationClassesSummaryMapper.java
  8. 1 1
      YijiaRestful/src/main/java/com/platform/yijia/dao/StationInfoMapper.java
  9. 3 0
      YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java
  10. 167 0
      YijiaRestful/src/main/java/com/platform/yijia/pojo/StationClassStructure.java
  11. 73 0
      YijiaRestful/src/main/java/com/platform/yijia/pojo/StationClassesSummary.java
  12. 122 0
      YijiaRestful/src/main/java/com/platform/yijia/service/IStationClassStructureService.java
  13. 62 0
      YijiaRestful/src/main/java/com/platform/yijia/service/IStationClassesSummaryService.java
  14. 6 0
      YijiaRestful/src/main/java/com/platform/yijia/service/PayOrderService.java
  15. 1 1
      YijiaRestful/src/main/java/com/platform/yijia/service/StationService.java
  16. 11 0
      YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java
  17. 177 0
      YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationClassStructureServiceImpl.java
  18. 95 0
      YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationClassesSummaryServiceImpl.java
  19. 1 1
      YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationServiceImpl.java
  20. 39 0
      YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml
  21. 395 0
      YijiaRestful/src/main/resources/mapper/StationClassStructureMapper.xml
  22. 134 0
      YijiaRestful/src/main/resources/mapper/StationClassesSummaryMapper.xml
  23. 1 1
      YijiaRestful/src/main/resources/mapper/StationInfoMapper.xml

+ 3 - 2
YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -46,10 +46,11 @@ public class AppUserInfoController {
      */
     @ResponseBody
     @RequestMapping(value = "/getSessionKeyAndOpenID")
-    public Map<String, Object> getSessionKeyAndOpenID(@RequestParam("code") String code, @RequestParam("stationId") String stationId){
+    public Map<String, Object> getSessionKeyAndOpenID(@RequestParam("code") String code, @RequestParam("stationId") Integer stationId){
+        logger.info("微信小程序获取用户openId和sessionKey入参code和stationId: "+code +"-----" +stationId);
         String appId = "";        //微信小程序appID
         String appSecret = "";      //微信小程序密钥
-        if(stationId !=null && stationId !=""){
+        if(stationId !=null){
             Map<String, String> map = stationService.getStationAppIdAndAppSecret(stationId);
             appId = map.get("appId");        //微信小程序appID
             appSecret = map.get("appSecret");      //微信小程序密钥

+ 1 - 1
YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -179,7 +179,7 @@ public class PayController {
                     reqData.put("trmIp", "172.16.2.1");//商家ip地址
                     // reqData.put("customerIp", ""); //持卡人ip地址,银联js支付时必传
 
-                    Map<String, String> stationAppIdAndAppSecret = stationService.getStationAppIdAndAppSecret(payInfoRequest.getStationId());
+                    Map<String, String> stationAppIdAndAppSecret = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
                     if(stationAppIdAndAppSecret !=null && stationAppIdAndAppSecret.containsKey("appId")){
                         reqData.put("subAppid", stationAppIdAndAppSecret.get("appId")); //微信子公众号
                         logger.info("支付子商户:"+ stationAppIdAndAppSecret.get("appId"));

+ 392 - 0
YijiaRestful/src/main/java/com/platform/yijia/controller/StationClassStructureController.java

@@ -0,0 +1,392 @@
+package com.platform.yijia.controller;
+
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.platform.yijia.pojo.PayOrder;
+import com.platform.yijia.pojo.StationClassStructure;
+import com.platform.yijia.pojo.StationClassesSummary;
+import com.platform.yijia.service.IStationClassStructureService;
+import com.platform.yijia.service.IStationClassesSummaryService;
+import com.platform.yijia.service.PayOrderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+
+/**
+ * pos机班结打印
+ */
+@Controller
+@RequestMapping("/api")
+public class StationClassStructureController {
+
+    private static Logger logger =(Logger) LoggerFactory.getLogger(StationClassStructureController.class);
+
+    @Resource
+    private IStationClassStructureService stationClassStructureService;
+
+    @Resource
+    private IStationClassesSummaryService stationClassesSummaryService;
+
+    @Resource
+    private PayOrderService payOrderService;
+
+
+    /**
+     * pos机班结
+     * @param stationClassStructure
+     * @return
+     * @throws ParseException
+     */
+    @PostMapping("/posClassStructure")
+    public Map posClassStructure (@RequestBody StationClassStructure stationClassStructure) throws ParseException {
+        //获取当前班结油
+        String stationName=stationClassStructure.getStationName();
+        String username = stationClassStructure.getClassStructureMan();
+        Integer stationId  =stationClassStructure.getStationId();
+        Map map =new HashMap();
+        //根据油站查询出油站是否班结过,班结过就需要查询上次班结的时间
+        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");
+        SimpleDateFormat dfe = 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(dfe.parse(beginTime));
+                stationclass.setClassStructureMan(username);
+                stationclass.setClassStructureNo(no);
+                stationclass.setClassStructureDate(date);
+                stationclass.setOrderNo(payOrder.getOrderNo());
+                stationclass.setOilGun(payOrder.getOilGun());
+                stationclass.setOilName(payOrder.getOilName());
+                if(payOrder.getOilPirce()!=null){
+                    stationclass.setOilPirce(new BigDecimal(payOrder.getOilPirce()));
+                }
+                if(payOrder.getOilType()!=null){
+                    stationclass.setOilType(payOrder.getOilType());
+                }
+                stationclass.setConsumerId(Integer.valueOf(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.setOrderType(payOrder.getOrderType());
+                if(payOrder.getPrintCount()!=null){
+                    stationclass.setPrintNum(payOrder.getPrintCount());
+                }else{
+                    stationclass.setPrintNum(Integer.valueOf("0"));
+                }
+
+                i= stationClassStructureService.insertStationClassStructure(stationclass);
+            }
+        }else{
+            //初次班结 班结时间默认为当前时间,班结人username
+            PayOrder p =new  PayOrder();
+            p.setStationId(stationId);
+            p.setStatus("1");
+            PayOrder orders= payOrderService.getPayOrderInfoMin(p);
+            if(orders!=null){
+                //根据班结时间查询订单
+                PayOrder order=new PayOrder();
+                beginTime= dateFormat.format(orders.getCreatedDate());
+                order.setStationId(stationId);
+                order.setStatus("1");
+                order.setEndTime(dateFormat.format(date));
+                List<PayOrder> list = payOrderService.selectPayOrderList(order);
+                if(list !=null && list.size()>0){
+                    for(PayOrder payOrder:list){
+                        StationClassStructure stationclass =new StationClassStructure();
+                        stationclass.setStationId(payOrder.getStationId());
+                        stationclass.setClassStartDate(dfe.parse(beginTime));
+                        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());
+                        if(payOrder.getOilPirce()!=null){
+                            stationclass.setOilPirce(new BigDecimal(payOrder.getOilPirce()));
+                        }
+                        if(payOrder.getOilType()!=null){
+                            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));
+                        }
+                        stationclass.setOrderLiters(new BigDecimal(payOrder.getOrderLiters()));
+                        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"));
+                        }
+                        i= stationClassStructureService.insertStationClassStructure(stationclass);
+                    }
+                }
+
+            }
+        }
+        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());
+            }
+            if(stationclass.getOrderLiters()!=null){
+                stationClassesSummary.setSaleLiters(stationclass.getOrderLiters());
+            }
+            if(stationclass.getAmt()!=null){
+                stationClassesSummary.setAmt(stationclass.getAmt());
+            }
+            if(stationclass.getReceivableAmt()!=null){
+                stationClassesSummary.setSaleAmt(stationclass.getReceivableAmt());
+            }
+            if(stationclass.getDiscountAmt()!=null){
+                stationClassesSummary.setDiscountAmt(stationclass.getDiscountAmt());
+            }
+            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.getPrintNum()!=null){
+                stationClassesSummary.setPrintNum(stationclass.getPrintNum());
+            }else{
+                stationClassesSummary.setPrintNum(Integer.valueOf("0"));
+            }
+            stationClassesSummary.setClassesMan(stationclass.getClassStructureMan());
+            i=stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary);
+            //查询班结小票数据
+            StationClassStructure classStructure= new StationClassStructure();
+            classStructure.setClassStructureNo(no);
+            classStructure.setStationId(stationId);
+            //根据油品汇总数据
+            List<StationClassStructure>  list= stationClassStructureService.listOilStructure(classStructure);
+            //支付方式汇总数据
+            List<StationClassStructure>  paylist= stationClassStructureService.listPayStructure(classStructure);
+            if(list!=null && list.size()>0 && paylist!=null && paylist.size()>0){
+                map.put("code","200");
+                map.put("msg","班结成功");
+                map.put("oilList",list);
+                map.put("payList",paylist);
+            }else{
+                map.put("code","500");
+                map.put("msg","班结失败");
+            }
+        }else{
+            map.put("code","500");
+            map.put("msg","班结失败");
+        }
+        return map;
+    }
+}

+ 112 - 0
YijiaRestful/src/main/java/com/platform/yijia/controller/StationClassesSummaryController.java

@@ -0,0 +1,112 @@
+//package com.platform.yijia.controller;
+//
+//import java.util.Arrays;
+//import java.util.List;
+//
+//import com.platform.yijia.pojo.StationClassesSummary;
+//import com.platform.yijia.service.IStationClassesSummaryService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Controller;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.PutMapping;
+//import org.springframework.web.bind.annotation.DeleteMapping;
+//import org.springframework.web.bind.annotation.PathVariable;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * 【请填写功能名称】Controller
+// *
+// * @author yijia
+// * @date 2020-12-28
+// */
+//@Controller
+//@RequestMapping("/api")
+//public class StationClassesSummaryController
+//{
+//    @Autowired
+//    private IStationClassesSummaryService stationClassesSummaryService;
+//    @Autowired
+//    private ISysUserService sysUserService;
+//    /**
+//     * 查询【请填写功能名称】列表
+//     */
+//    @GetMapping("/list")
+//    public TableDataInfo list(StationClassesSummary stationClassesSummary)
+//    {
+//        LoginUser currentUser = SecurityUtils.getLoginUser();
+//        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+//        if(selectDeptid !=null && selectDeptid!=""){
+//            List<String> list = Arrays.asList(selectDeptid.split(","));
+//            stationClassesSummary.setStationIdList(list);
+//        }
+//        startPage();
+////        stationClassesSummary.setStationId(Long.valueOf("5"));
+//        List<StationClassesSummary> list = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
+//        return getDataTable(list);
+//    }
+//
+//    /**
+//     * 导出【请填写功能名称】列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('station:summary:export')")
+//    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(StationClassesSummary stationClassesSummary)
+//    {
+//        LoginUser currentUser = SecurityUtils.getLoginUser();
+//        String selectDeptid= sysUserService.getUserRoleDeptId(currentUser);
+//        if(selectDeptid !=null && selectDeptid!=""){
+//            List<String> list = Arrays.asList(selectDeptid.split(","));
+//            stationClassesSummary.setStationIdList(list);
+//        }
+//        List<StationClassesSummary> list = stationClassesSummaryService.selectStationClassesSummaryList(stationClassesSummary);
+//        ExcelUtil<StationClassesSummary> util = new ExcelUtil<StationClassesSummary>(StationClassesSummary.class);
+//        return util.exportExcel(list, "summary");
+//    }
+//
+//    /**
+//     * 获取【请填写功能名称】详细信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('station:summary:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(stationClassesSummaryService.selectStationClassesSummaryById(id));
+//    }
+//
+//    /**
+//     * 新增【请填写功能名称】
+//     */
+//    @PreAuthorize("@ss.hasPermi('station:summary:add')")
+//    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody StationClassesSummary stationClassesSummary)
+//    {
+//        return toAjax(stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary));
+//    }
+//
+//    /**
+//     * 修改【请填写功能名称】
+//     */
+//    @PreAuthorize("@ss.hasPermi('station:summary:edit')")
+//    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody StationClassesSummary stationClassesSummary)
+//    {
+//        return toAjax(stationClassesSummaryService.updateStationClassesSummary(stationClassesSummary));
+//    }
+//
+//    /**
+//     * 删除【请填写功能名称】
+//     */
+//    @PreAuthorize("@ss.hasPermi('station:summary:remove')")
+//    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(stationClassesSummaryService.deleteStationClassesSummaryByIds(ids));
+//    }
+//}

+ 5 - 0
YijiaRestful/src/main/java/com/platform/yijia/dao/PayOrderMapper.java

@@ -81,6 +81,11 @@ public interface PayOrderMapper {
     //查询加油员
     List<Map> selectPersonelName(Map<String, Object> map);
 
+    //查询班结订单
+    List<PayOrder> selectPayOrderList(PayOrder payOrder);
+
+    PayOrder getPayOrderInfoMin(PayOrder payOrder);
+
 
     /**
      * This method was generated by MyBatis Generator.

+ 121 - 0
YijiaRestful/src/main/java/com/platform/yijia/dao/StationClassStructureMapper.java

@@ -0,0 +1,121 @@
+package com.platform.yijia.dao;
+
+import com.platform.yijia.pojo.StationClassStructure;
+
+import java.util.List;
+
+/**
+ * 班结管理Mapper接口
+ *
+ * @author yijia
+ * @date 2020-12-31
+ */
+public interface StationClassStructureMapper
+{
+    /**
+     * 查询班结管理
+     *
+     * @param id 班结管理ID
+     * @return 班结管理
+     */
+    public StationClassStructure selectStationClassStructureById(Long id);
+
+    /**
+     * 查询班结管理列表
+     *
+     * @param stationClassStructure 班结管理
+     * @return 班结管理集合
+     */
+    public List<StationClassStructure> selectStationClassStructureList(StationClassStructure stationClassStructure);
+
+    /**
+     * 新增班结管理
+     *
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int insertStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 修改班结管理
+     *
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int updateStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 删除班结管理
+     *
+     * @param id 班结管理ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureById(Long id);
+
+    /**
+     * 批量删除班结管理
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureByIds(Long[] ids);
+
+    /**
+     *
+     * @param stationClassStructure
+     * @return
+     */
+    public  List<StationClassStructure> listPersonnelStructure(StationClassStructure stationClassStructure);
+
+    /**
+     *
+     * @param classes
+     * @return
+     */
+    public StationClassStructure selectStationClassStructureMax(StationClassStructure classes);
+
+    /**
+     *
+     * @param stationClassStructure
+     * @return
+     */
+    public List<StationClassStructure> listOilStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 查询今天班结了几次生成班结
+     * @param classesStructure
+     * @return
+     */
+    public StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure);
+
+    /**
+     * 根据班次号汇总班结数据
+     * @param scs
+     * @return
+     */
+    public StationClassStructure selectSummyClassStructure(StationClassStructure scs);
+
+    /**
+     * 按员工支付方式汇总班结数据
+     * @param stationClassStructure
+     * @return
+     */
+    public List<StationClassStructure> listPersonnelPayStructure(StationClassStructure stationClassStructure);
+/*获取当前人班结信息
+ */
+    public  StationClassStructure listClass(StationClassStructure stationClassStructure);
+
+    /**
+     * 导出数据
+     * @param stationClassStructure
+     * @return
+     */
+    public List<StationClassStructure> selectStationClassStructureExport(StationClassStructure stationClassStructure);
+
+    /***
+     * 根据支付方式汇总数据
+     * @param classStructure
+     * @return
+     */
+    public List<StationClassStructure> listPayStructure(StationClassStructure classStructure);
+}

+ 62 - 0
YijiaRestful/src/main/java/com/platform/yijia/dao/StationClassesSummaryMapper.java

@@ -0,0 +1,62 @@
+package com.platform.yijia.dao;
+
+import com.platform.yijia.pojo.StationClassesSummary;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Mapper接口
+ *
+ * @author yijia
+ * @date 2020-12-28
+ */
+public interface StationClassesSummaryMapper
+{
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public StationClassesSummary selectStationClassesSummaryById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<StationClassesSummary> selectStationClassesSummaryList(StationClassesSummary stationClassesSummary);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertStationClassesSummary(StationClassesSummary stationClassesSummary);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateStationClassesSummary(StationClassesSummary stationClassesSummary);
+
+    /**
+     * 删除【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteStationClassesSummaryById(Long id);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteStationClassesSummaryByIds(Long[] ids);
+}

+ 1 - 1
YijiaRestful/src/main/java/com/platform/yijia/dao/StationInfoMapper.java

@@ -13,7 +13,7 @@ public interface StationInfoMapper {
     String getStationDiscountWay(String stationId);
 
     //获取小程序APPID和APPSECRET
-    Map<String, String> getStationAppIdAndAppSecret(String stationId);
+    Map<String, String> getStationAppIdAndAppSecret(Integer stationId);
 
     /**
      * This method was generated by MyBatis Generator.

+ 3 - 0
YijiaRestful/src/main/java/com/platform/yijia/pojo/PayOrder.java

@@ -46,4 +46,7 @@ public class PayOrder {
     private String customerGrade; //客户等级
     private String oilType; //油品类型 oil_type
 
+    private String beginTime;
+    private String endTime;
+
 }

+ 167 - 0
YijiaRestful/src/main/java/com/platform/yijia/pojo/StationClassStructure.java

@@ -0,0 +1,167 @@
+package com.platform.yijia.pojo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 班结管理对象 station_class_structure
+ *
+ * @author yijia
+ * @date 2021-01-12
+ */
+@Data
+public class StationClassStructure {
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 订单号 */
+    private String orderNo;
+
+    /** 油站id */
+    private Integer stationId;
+
+    /** 油站名称 */
+    private String stationName;
+
+    /** 加油枪号 */
+    private String oilGun;
+
+    /** 油品名称 */
+    private String oilName;
+
+    /** 油品价格 */
+    private BigDecimal oilPirce;
+
+    /** 油品类型(柴油,汽油) */
+    private String oilType;
+
+    /** 用户(app_user_info  id消费者id) */
+    private Integer consumerId;
+
+    /** 消费者 */
+    private String consumer;
+
+    /** 金额 */
+    private BigDecimal amt;
+
+    /** 加油升数 */
+    private BigDecimal  orderLiters;
+
+    /** 支付类型 sxf */
+
+    private String payType;
+
+    /** 支付方式:02公众号 03小程序 */
+
+    private String payWay;
+
+    /** 支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date payDate;
+
+    /** 加油员人名 */
+    private String oilPersonnel;
+
+    /** 订单类型订单类型(1.柴油,2.汽油,积分:3.现金+积分4.现金,5.积分) */
+    private String orderType;
+
+    /** 打印小票数(含重复) */
+    private Integer printNum;
+
+    /** 班次号 */
+    private String classStructureNo;
+
+    /** 班结开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date classStartDate;
+
+    /** 班结时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date classStructureDate;
+
+    /** 班结人 */
+    private String classStructureMan;
+
+    /** 油品 */
+
+    private String oils;
+    /** like 查询班结号 */
+    private String likeClassStructureNo;
+    /** like 返回参数 */
+    private Integer num;
+
+    /** 应收金额 */
+    private BigDecimal receivableAmt;
+
+    /** 到账金额 */
+    private BigDecimal receivedAmt;
+
+    /** 优惠金额 */
+    private BigDecimal discountAmt;
+
+    /** 优惠劵金额 */
+    private BigDecimal discountCouponAmt;
+
+    /** 优惠劵 */
+    private String discountCoupon;
+
+    /** 微信金额 */
+    private BigDecimal wxAmt;
+
+    /** 支付宝金额 */
+    private BigDecimal zfbAmt;
+
+    /** pos支付金额 */
+    private BigDecimal posAmt;
+
+    /** 现金支付金额 */
+    private BigDecimal xjAmt;
+
+    /** 滴滴app支付金额 */
+    private BigDecimal didiAppAmt;
+
+    /** 团油app支付金额 */
+    private BigDecimal tyAppAmt;
+
+    /** 其他支付金额 */
+    private BigDecimal otherAmt;
+
+    /** 电子卡金额 */
+    private BigDecimal dzkAmt;
+
+    /** 消费积分 */
+    private Long score;
+
+    /** 会员卡号 */
+    private String memberNo;
+
+    /** 会员支付金额 */
+    private BigDecimal memberAmt;
+
+    /** 车牌号 */
+    private String carNo;
+
+    /** 客户电话 */
+    private String customerPhone;
+
+    /** 客户等级 */
+    private String customerGrade;
+
+
+    /**
+     * 出参
+     * @param id
+     */
+   //微信数量
+    private Integer wxNum;
+   // 支付宝支付数量
+    private Integer zfbNum;
+    //现金支付数量
+    private Integer xjNum;
+
+}

+ 73 - 0
YijiaRestful/src/main/java/com/platform/yijia/pojo/StationClassesSummary.java

@@ -0,0 +1,73 @@
+package com.platform.yijia.pojo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+/**
+ * 班结汇总对象 station_classes_summary
+ *
+ * @author yijia
+ * @date 2021-01-27
+ */
+@Data
+public class StationClassesSummary
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 班结主键id */
+    private Long id;
+
+    /** 班次号 */
+    private String classesNo;
+
+    /** 班次开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /** 班次结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /** 油站id */
+    private Integer stationId;
+
+    /** 油站名称 */
+    private String stationName;
+
+    /** 订单数 */
+    private Integer orderNum;
+
+    /** 小票数量 */
+    private Integer printNum;
+
+    /** 销量L */
+    private BigDecimal saleLiters;
+
+    /** 应收金额 */
+    private BigDecimal saleAmt;
+
+    /** 实际支付金额 */
+    private BigDecimal amt;
+
+    /** 优惠金额 */
+    private BigDecimal discountAmt;
+
+    /** 微信实际支付金额 */
+    private BigDecimal wxAmt;
+
+    /** 支付宝实际支付金额 */
+    private BigDecimal zfbAmt;
+
+    /** 电子卡实际支付金额 */
+    private BigDecimal dzkAmt;
+
+    /** 班结人 */
+    private String classesMan;
+
+    private List<String> stationIdList;
+
+}

+ 122 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/IStationClassStructureService.java

@@ -0,0 +1,122 @@
+package com.platform.yijia.service;
+
+import com.platform.yijia.pojo.StationClassStructure;
+
+import java.util.List;
+
+/**
+ * 班结管理Service接口
+ *
+ * @author yijia
+ * @date 2020-12-31
+ */
+public interface IStationClassStructureService
+{
+    /**
+     * 查询班结管理
+     *
+     * @param id 班结管理ID
+     * @return 班结管理
+     */
+    public StationClassStructure selectStationClassStructureById(Long id);
+
+    /**
+     * 查询班结管理列表
+     *
+     * @param stationClassStructure 班结管理
+     * @return 班结管理集合
+     */
+    public List<StationClassStructure> selectStationClassStructureList(StationClassStructure stationClassStructure);
+
+    /**
+     * 新增班结管理
+     *
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int insertStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 修改班结管理
+     *
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    public int updateStationClassStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 批量删除班结管理
+     *
+     * @param ids 需要删除的班结管理ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureByIds(Long[] ids);
+
+    /**
+     * 删除班结管理信息
+     *
+     * @param id 班结管理ID
+     * @return 结果
+     */
+    public int deleteStationClassStructureById(Long id);
+
+    /**
+     * 根据人员班结汇总
+     * @param stationClassStructure
+     * @return
+     */
+    public List<StationClassStructure> listPersonnelStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 查询该油站信息最后一次班结信息
+     * @param classes
+     * @return
+     */
+    StationClassStructure selectStationClassStructureMax(StationClassStructure classes);
+
+    /**
+     * 按油品汇总班结数据
+     * @param stationClassStructure
+     * @return
+     */
+    List<StationClassStructure> listOilStructure(StationClassStructure stationClassStructure);
+
+    /**
+     * 查询今天班结了几次生成班结
+     * @param classesStructure
+     * @return
+     */
+    StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure);
+
+    /**
+     * 根据班次号查询班结汇总数据
+     * @param scs
+     * @return
+     */
+    StationClassStructure selectSummyClassStructure(StationClassStructure scs);
+
+    /**
+     * 根据员工/支付方式汇总班结数据
+     * @param stationClassStructure
+     * @return
+     */
+    List<StationClassStructure> listPersonnelPayStructure(StationClassStructure stationClassStructure);
+
+
+    public StationClassStructure listClass(StationClassStructure stationClassStructure);
+
+    /**
+     * 导出数据
+     * @param stationClassStructure
+     * @return
+     */
+    public List<StationClassStructure> selectStationClassStructureExport(StationClassStructure stationClassStructure);
+
+    /**
+     * 根据支付方式汇总班结数据
+     * @param classStructure
+     * @return
+     */
+
+    public List<StationClassStructure> listPayStructure(StationClassStructure classStructure);
+}

+ 62 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/IStationClassesSummaryService.java

@@ -0,0 +1,62 @@
+package com.platform.yijia.service;
+
+import com.platform.yijia.pojo.StationClassesSummary;
+
+import java.util.List;
+
+/**
+ * 【请填写功能名称】Service接口
+ *
+ * @author yijia
+ * @date 2020-12-28
+ */
+public interface IStationClassesSummaryService
+{
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    public StationClassesSummary selectStationClassesSummaryById(Long id);
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 【请填写功能名称】集合
+     */
+    public List<StationClassesSummary> selectStationClassesSummaryList(StationClassesSummary stationClassesSummary);
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 结果
+     */
+    public int insertStationClassesSummary(StationClassesSummary stationClassesSummary);
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 结果
+     */
+    public int updateStationClassesSummary(StationClassesSummary stationClassesSummary);
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteStationClassesSummaryByIds(Long[] ids);
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    public int deleteStationClassesSummaryById(Long id);
+}

+ 6 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/PayOrderService.java

@@ -16,6 +16,12 @@ public interface PayOrderService {
      //根据订单号查询订单信息
      List<PayOrder> getPayOrderList(String orderNo);
 
+     //查询班结时间内订单
+     List<PayOrder> selectPayOrderList(PayOrder payOrder);
+
+     //查询订单信息
+     PayOrder getPayOrderInfoMin(PayOrder payOrder);
+
      //修改订单状态
      int getUpdatePayOrder(PayOrder payOrder);
 

+ 1 - 1
YijiaRestful/src/main/java/com/platform/yijia/service/StationService.java

@@ -25,5 +25,5 @@ public interface StationService {
     String getStationDiscountWay(String stationId);
 
     //获取小程序APPID和APPSECRET
-    Map<String, String> getStationAppIdAndAppSecret(String stationId);
+    Map<String, String> getStationAppIdAndAppSecret(Integer stationId);
 }

+ 11 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/impl/PayOrderServiceImpl.java

@@ -213,6 +213,17 @@ public class PayOrderServiceImpl implements PayOrderService {
         return payOrderMapper.selectByExample(example);
     }
 
+    //查询班结时间订单
+    @Override
+    public List<PayOrder> selectPayOrderList(PayOrder payOrder) {
+        return payOrderMapper.selectPayOrderList(payOrder);
+    }
+
+    @Override
+    public PayOrder getPayOrderInfoMin(PayOrder payOrder) {
+        return payOrderMapper.getPayOrderInfoMin(payOrder);
+    }
+
     /**
      * 修改订单信息
      * @param payOrder

+ 177 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationClassStructureServiceImpl.java

@@ -0,0 +1,177 @@
+package com.platform.yijia.service.impl;
+
+import java.util.List;
+
+import com.platform.yijia.dao.StationClassStructureMapper;
+import com.platform.yijia.pojo.StationClassStructure;
+import com.platform.yijia.service.IStationClassStructureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 班结管理Service业务层处理
+ *
+ * @author yijia
+ * @date 2020-12-31
+ */
+@Service("IStationClassStructureService")
+public class StationClassStructureServiceImpl implements IStationClassStructureService
+{
+    @Resource
+    private StationClassStructureMapper stationClassStructureMapper;
+
+    /**
+     * 查询班结管理
+     *
+     * @param id 班结管理ID
+     * @return 班结管理
+     */
+    @Override
+    public StationClassStructure selectStationClassStructureById(Long id)
+    {
+        return stationClassStructureMapper.selectStationClassStructureById(id);
+    }
+
+    /**
+     * 查询班结管理列表
+     *
+     * @param stationClassStructure 班结管理
+     * @return 班结管理
+     */
+    @Override
+    public List<StationClassStructure> selectStationClassStructureList(StationClassStructure stationClassStructure)
+    {
+        return stationClassStructureMapper.selectStationClassStructureList(stationClassStructure);
+    }
+
+    /**
+     * 新增班结管理
+     *
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    @Override
+    public int insertStationClassStructure(StationClassStructure stationClassStructure)
+    {
+        return stationClassStructureMapper.insertStationClassStructure(stationClassStructure);
+    }
+
+    /**
+     * 修改班结管理
+     *
+     * @param stationClassStructure 班结管理
+     * @return 结果
+     */
+    @Override
+    public int updateStationClassStructure(StationClassStructure stationClassStructure)
+    {
+        return stationClassStructureMapper.updateStationClassStructure(stationClassStructure);
+    }
+
+    /**
+     * 批量删除班结管理
+     *
+     * @param ids 需要删除的班结管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationClassStructureByIds(Long[] ids)
+    {
+        return stationClassStructureMapper.deleteStationClassStructureByIds(ids);
+    }
+
+    /**
+     * 删除班结管理信息
+     *
+     * @param id 班结管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationClassStructureById(Long id)
+    {
+        return stationClassStructureMapper.deleteStationClassStructureById(id);
+    }
+
+    /**
+     * listPersonnelStructure
+     * @param stationClassStructure
+     * @return
+     */
+    @Override
+    public List<StationClassStructure> listPersonnelStructure(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.listPersonnelStructure(stationClassStructure);
+    }
+
+    /**
+     * 查询该油站最大的班结id
+     * @param classes
+     * @return
+     */
+    @Override
+    public StationClassStructure selectStationClassStructureMax(StationClassStructure classes) {
+        return stationClassStructureMapper.selectStationClassStructureMax(classes);
+    }
+
+    /**
+     *
+     * @param stationClassStructure
+     * @return
+     */
+    @Override
+    public List<StationClassStructure> listOilStructure(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.listOilStructure(stationClassStructure);
+    }
+
+    /**
+     * 查询今天班结了几次生成班结
+     * @param classesStructure
+     * @return
+     */
+    @Override
+    public StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure) {
+        return stationClassStructureMapper.selectDistnctClassStructure(classesStructure);
+    }
+
+    /**
+     * 根据班次号查询班结汇总
+     * @param scs
+     * @return
+     */
+    @Override
+    public StationClassStructure selectSummyClassStructure(StationClassStructure scs) {
+        return stationClassStructureMapper.selectSummyClassStructure(scs);
+    }
+
+    @Override
+    public List<StationClassStructure> listPersonnelPayStructure(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.listPersonnelPayStructure(stationClassStructure);
+    }
+
+    @Override
+    public StationClassStructure listClass(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.listClass(stationClassStructure);
+    }
+
+    /**
+     * 导出数据
+     * @param stationClassStructure
+     * @return
+     */
+    @Override
+    public List<StationClassStructure> selectStationClassStructureExport(StationClassStructure stationClassStructure) {
+        return stationClassStructureMapper.selectStationClassStructureExport(stationClassStructure);
+    }
+
+    /**
+     * 根据支付方式汇总数据
+     * @param classStructure
+     * @return
+     */
+    @Override
+    public List<StationClassStructure> listPayStructure(StationClassStructure classStructure) {
+        return stationClassStructureMapper.listPayStructure(classStructure);
+    }
+
+}

+ 95 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationClassesSummaryServiceImpl.java

@@ -0,0 +1,95 @@
+package com.platform.yijia.service.impl;
+
+import java.util.List;
+
+import com.platform.yijia.dao.StationClassesSummaryMapper;
+import com.platform.yijia.pojo.StationClassesSummary;
+import com.platform.yijia.service.IStationClassesSummaryService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 【请填写功能名称】Service业务层处理
+ *
+ * @author yijia
+ * @date 2020-12-28
+ */
+@Service("IStationClassesSummaryService")
+public class StationClassesSummaryServiceImpl implements IStationClassesSummaryService
+{
+    @Resource
+    private StationClassesSummaryMapper stationClassesSummaryMapper;
+
+    /**
+     * 查询【请填写功能名称】
+     *
+     * @param id 【请填写功能名称】ID
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public StationClassesSummary selectStationClassesSummaryById(Long id)
+    {
+        return stationClassesSummaryMapper.selectStationClassesSummaryById(id);
+    }
+
+    /**
+     * 查询【请填写功能名称】列表
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 【请填写功能名称】
+     */
+    @Override
+    public List<StationClassesSummary> selectStationClassesSummaryList(StationClassesSummary stationClassesSummary)
+    {
+        return stationClassesSummaryMapper.selectStationClassesSummaryList(stationClassesSummary);
+    }
+
+    /**
+     * 新增【请填写功能名称】
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int insertStationClassesSummary(StationClassesSummary stationClassesSummary)
+    {
+        return stationClassesSummaryMapper.insertStationClassesSummary(stationClassesSummary);
+    }
+
+    /**
+     * 修改【请填写功能名称】
+     *
+     * @param stationClassesSummary 【请填写功能名称】
+     * @return 结果
+     */
+    @Override
+    public int updateStationClassesSummary(StationClassesSummary stationClassesSummary)
+    {
+        return stationClassesSummaryMapper.updateStationClassesSummary(stationClassesSummary);
+    }
+
+    /**
+     * 批量删除【请填写功能名称】
+     *
+     * @param ids 需要删除的【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationClassesSummaryByIds(Long[] ids)
+    {
+        return stationClassesSummaryMapper.deleteStationClassesSummaryByIds(ids);
+    }
+
+    /**
+     * 删除【请填写功能名称】信息
+     *
+     * @param id 【请填写功能名称】ID
+     * @return 结果
+     */
+    @Override
+    public int deleteStationClassesSummaryById(Long id)
+    {
+        return stationClassesSummaryMapper.deleteStationClassesSummaryById(id);
+    }
+}

+ 1 - 1
YijiaRestful/src/main/java/com/platform/yijia/service/impl/StationServiceImpl.java

@@ -170,7 +170,7 @@ public class StationServiceImpl implements StationService {
 
     //获取小程序APPID和APPSECRET
     @Override
-    public Map<String, String> getStationAppIdAndAppSecret(String stationId) {
+    public Map<String, String> getStationAppIdAndAppSecret(Integer stationId) {
         return stationInfoMapper.getStationAppIdAndAppSecret(stationId);
     }
 

+ 39 - 0
YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -131,6 +131,45 @@
     print_count, car_no, customer_phone, customer_grade, oil_type
   </sql>
 
+  <!--查询班结时间内订单-->
+  <select id="selectPayOrderList" parameterType="com.platform.yijia.pojo.PayOrder" resultMap="BaseResultMap">
+    SELECT
+        <include refid="Base_Column_List"/>
+    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 pay_date &gt;= #{beginTime}
+      </if>
+      <if test="endTime !=null">
+        AND pay_date &lt; #{endTime}
+      </if>
+    </where>
+  </select>
+
+  <!--初次班结 班结时间默认为当前时间订单信息-->
+  <select id="getPayOrderInfoMin" parameterType="com.platform.yijia.pojo.PayOrder" resultMap="BaseResultMap">
+    SELECT
+        <include refid="Base_Column_List"/>
+    FROM
+        pay_order
+    <where>
+      <if test="stationId !=null">
+        station_id= #{stationId}
+      </if>
+      <if test="status !=null">
+        AND status= #{status}
+      </if>
+    </where>
+  </select>
+
+
   <!--根据用户openId和用户类型userType查询用户订单-->
   <select id="getOrderListByOpenIdAndUserType" parameterType="com.platform.yijia.pojo.AppUserInfo" resultType="com.platform.yijia.pojo.PayOrder">
     SELECT

+ 395 - 0
YijiaRestful/src/main/resources/mapper/StationClassStructureMapper.xml

@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.platform.yijia.dao.StationClassStructureMapper">
+
+    <resultMap type="com.platform.yijia.pojo.StationClassStructure" id="StationClassStructureResult">
+        <result property="id"    column="id"    />
+        <result property="orderNo"    column="order_no"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="oilGun"    column="oil_gun"    />
+        <result property="oilName"    column="oil_name"    />
+        <result property="oilPirce"    column="oil_pirce"    />
+        <result property="oilType"    column="oil_type"    />
+        <result property="consumerId"    column="consumer_id"    />
+        <result property="consumer"    column="consumer"    />
+        <result property="amt"    column="amt"    />
+        <result property="orderLiters"    column="order_liters"    />
+        <result property="payType"    column="pay_type"    />
+        <result property="payWay"    column="pay_way"    />
+        <result property="payDate"    column="pay_date"    />
+        <result property="oilPersonnel"    column="oil_personnel"    />
+        <result property="orderType"    column="order_type"    />
+        <result property="printNum"    column="print_num"    />
+        <result property="classStructureNo"    column="class_structure_no"    />
+        <result property="classStartDate"    column="class_start_date"    />
+        <result property="classStructureDate"    column="class_structure_date"    />
+        <result property="classStructureMan"    column="class_structure_man"    />
+        <result property="oils"    column="oils"    />
+        <result property="receivableAmt"    column="receivable_amt"    />
+        <result property="receivedAmt"    column="received_amt"    />
+        <result property="discountAmt"    column="discount_amt"    />
+        <result property="discountCouponAmt"    column="discount_coupon_amt"    />
+        <result property="discountCoupon"    column="discount_coupon"    />
+        <result property="wxAmt"    column="wx_amt"    />
+        <result property="zfbAmt"    column="zfb_amt"    />
+        <result property="posAmt"    column="pos_amt"    />
+        <result property="xjAmt"    column="xj_amt"    />
+        <result property="didiAppAmt"    column="didi_app_amt"    />
+        <result property="tyAppAmt"    column="ty_app_amt"    />
+        <result property="otherAmt"    column="other_amt"    />
+        <result property="dzkAmt"    column="dzk_amt"    />
+        <result property="score"    column="score"    />
+        <result property="memberNo"    column="member_no"    />
+        <result property="memberAmt"    column="member_amt"    />
+        <result property="carNo"    column="car_no"    />
+        <result property="customerPhone"    column="customer_phone"    />
+        <result property="customerGrade"    column="customer_grade"    />
+        <result property="num"    column="num"    />
+        <result property="wxNum"    column="wx_num"    />
+        <result property="zfbNum"    column="zfb_num"    />
+        <result property="xjNum"    column="xj_num"    />
+    </resultMap>
+
+    <sql id="selectStationClassStructureVo">
+        select id, order_no, station_id, station_name, oil_gun, oil_name, oil_pirce, oil_type, consumer_id, consumer, amt, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, print_num, class_structure_no, class_start_date, class_structure_date, class_structure_man, oils, receivable_amt, received_amt, discount_amt, discount_coupon_amt, discount_coupon, wx_amt, zfb_amt, pos_amt, xj_amt, didi_app_amt, ty_app_amt, other_amt, dzk_amt, score, member_no, member_amt, car_no, customer_phone, customer_grade from station_class_structure
+    </sql>
+
+    <select id="selectStationClassStructureList" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null "> and oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
+            <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
+            <if test="payDate != null "> and pay_date = #{payDate}</if>
+            <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            <if test="classStartDate != null "> and class_start_date = #{classStartDate}</if>
+            <if test="classStructureDate != null "> and class_structure_date = #{classStructureDate}</if>
+            <if test="classStructureMan != null  and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
+            <if test="oils != null  and oils != ''"> and oils = #{oils}</if>
+            <if test="receivableAmt != null "> and receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and received_amt = #{receivedAmt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
+            <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
+            <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
+            <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
+            <if test="customerGrade != null  and customerGrade != ''"> and customer_grade = #{customerGrade}</if>
+        </where>
+        order by  id desc
+    </select>
+
+    <select id="listPersonnelStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT a.oil_personnel,GROUP_CONCAT(DISTINCT a.oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(order_liters),2) as order_liters,COUNT(order_no) as order_no
+        from station_class_structure a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+        GROUP BY a.oil_personnel
+    </select>
+
+    <select id="listOilStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+       	SELECT a.station_id, a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(a.receivable_amt),2) as receivable_amt,ROUND(SUM(a.received_amt),2) as received_amt,ROUND(SUM(order_liters),2) as order_liters,ROUND(SUM(a.discount_amt),2) as discount_amt ,COUNT(order_no) as order_no,a.class_start_date,a.class_structure_date,a.class_structure_man,sum(a.print_num) print_num
+        from station_class_structure a
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+        GROUP BY a.oil_name,a.station_id,a.class_start_date,a.class_structure_date,a.class_structure_man
+    </select>
+    <select id="selectStationClassStructureMax" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        select id, station_id, order_no, oil_gun, oil_name, consumer_id, consumer, amt, station_name, order_liters, pay_type, pay_way, pay_date, oil_personnel, order_type, oil_type, print_num, class_structure_no, class_structure_date, class_structure_man, oils
+         from station_class_structure
+       	 where id = (
+            SELECT MAX(id) from station_class_structure
+            <where>
+                <if test="stationId != null "> and station_id = #{stationId}</if>
+            </where>
+		)
+    </select>
+
+    <select id="selectStationClassStructureById" parameterType="Long" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        where id = #{id}
+    </select>
+    <select id="selectDistnctClassStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+      select count(DISTINCT class_structure_no) as num
+            from station_class_structure
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="likeClassStructureNo != null  and likeClassStructureNo != ''">  and class_structure_no like concat( #{likeClassStructureNo}, '%') </if>
+        </where>
+    </select>
+    <!--根据班次号汇总班结数据-->
+    <select id="selectSummyClassStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        select  class_structure_no,class_start_date,class_structure_date,station_id,station_name,count(order_no) as num,
+        sum(order_liters) as order_liters,sum(receivable_amt) as receivable_amt,sum(amt) as amt,class_structure_man,
+        sum(print_num) as print_num,sum(wx_amt) as wx_amt,sum(zfb_amt) as zfb_amt,
+        sum(dzk_amt) as dzk_amt,sum(discount_amt) as discount_amt,SUM(pos_amt) as pos_amt,sum(xj_amt) as xj_amt
+        from station_class_structure
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+        GROUP BY class_structure_no,class_start_date,station_id,station_name,class_structure_date,class_structure_man
+    </select>
+
+    <!--按员工/支付方式汇总数据-->
+    <select id="listPersonnelPayStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT oil_personnel,GROUP_CONCAT(DISTINCT oil_gun) oil_gun,count(wx_amt) wx_num,count(zfb_amt) zfb_num,count(xj_amt) xj_num,sum(discount_amt) discount_amt,SUM(discount_coupon_amt) discount_coupon_amt,SUM(wx_amt) wx_amt,SUM(zfb_amt) zfb_amt,SUM(xj_amt) xj_amt,sum(member_amt) member_amt
+        from  station_class_structure
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+        GROUP BY oil_personnel
+    </select>
+
+    <select id="listClass" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        SELECT *  from
+        station_class_structure
+        where id =(SELECT max(id) from station_class_structure
+            <where>
+                <if test="classStructureMan != null and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
+                <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            </where>
+        )
+    </select>
+    <!--根据支付方式汇总数据-->
+    <select id="listPayStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+      	SELECT dict_label as pay_type,sum(order_liters) as order_liters,sum(discount_amt) as discount_amt,count(order_no) order_no,sum(amt) as amt,sum(receivable_amt) as receivable_amt,sum(received_amt) as received_amt
+		from   station_class_structure left JOIN sys_dict_data on dict_value = pay_type and dict_type ='pay_type'
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+		GROUP BY pay_type,dict_label
+    </select>
+<!--  导出数据-->
+    <select id="selectStationClassStructureExport" parameterType="com.platform.yijia.pojo.StationClassStructure" resultMap="StationClassStructureResult">
+        <include refid="selectStationClassStructureVo"/>
+        <where>
+            <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="oilGun != null  and oilGun != ''"> and oil_gun = #{oilGun}</if>
+            <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="oilPirce != null "> and oil_pirce = #{oilPirce}</if>
+            <if test="oilType != null  and oilType != ''"> and oil_type = #{oilType}</if>
+            <if test="consumerId != null "> and consumer_id = #{consumerId}</if>
+            <if test="consumer != null  and consumer != ''"> and consumer = #{consumer}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="orderLiters != null "> and order_liters = #{orderLiters}</if>
+            <if test="payType != null  and payType != ''"> and pay_type = #{payType}</if>
+            <if test="payWay != null  and payWay != ''"> and pay_way = #{payWay}</if>
+            <if test="payDate != null "> and pay_date = #{payDate}</if>
+            <if test="oilPersonnel != null  and oilPersonnel != ''"> and oil_personnel = #{oilPersonnel}</if>
+            <if test="orderType != null  and orderType != ''"> and order_type = #{orderType}</if>
+            <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="classStructureNo != null  and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+            <if test="classStartDate != null "> and class_start_date = #{classStartDate}</if>
+            <if test="classStructureDate != null "> and class_structure_date = #{classStructureDate}</if>
+            <if test="classStructureMan != null  and classStructureMan != ''"> and class_structure_man = #{classStructureMan}</if>
+            <if test="oils != null  and oils != ''"> and oils = #{oils}</if>
+            <if test="receivableAmt != null "> and receivable_amt = #{receivableAmt}</if>
+            <if test="receivedAmt != null "> and received_amt = #{receivedAmt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="discountCouponAmt != null "> and discount_coupon_amt = #{discountCouponAmt}</if>
+            <if test="discountCoupon != null  and discountCoupon != ''"> and discount_coupon = #{discountCoupon}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <if test="zfbAmt != null "> and zfb_amt = #{zfbAmt}</if>
+            <if test="posAmt != null "> and pos_amt = #{posAmt}</if>
+            <if test="xjAmt != null "> and xj_amt = #{xjAmt}</if>
+            <if test="didiAppAmt != null "> and didi_app_amt = #{didiAppAmt}</if>
+            <if test="tyAppAmt != null "> and ty_app_amt = #{tyAppAmt}</if>
+            <if test="otherAmt != null "> and other_amt = #{otherAmt}</if>
+            <if test="dzkAmt != null "> and dzk_amt = #{dzkAmt}</if>
+            <if test="score != null "> and score = #{score}</if>
+            <if test="memberNo != null  and memberNo != ''"> and member_no = #{memberNo}</if>
+            <if test="memberAmt != null "> and member_amt = #{memberAmt}</if>
+            <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
+            <if test="customerPhone != null  and customerPhone != ''"> and customer_phone = #{customerPhone}</if>
+            <if test="likePayDate != null  and likePayDate != ''">
+              and date_format(pay_date,'%Y-%m-%d') = date_format(#{likePayDate},'%Y-%m-%d')
+            </if>
+        </where>
+        order by  id desc
+    </select>
+
+    <insert id="insertStationClassStructure" parameterType="com.platform.yijia.pojo.StationClassStructure" useGeneratedKeys="true" keyProperty="id">
+        insert into station_class_structure
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">order_no,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="oilGun != null">oil_gun,</if>
+            <if test="oilName != null">oil_name,</if>
+            <if test="oilPirce != null">oil_pirce,</if>
+            <if test="oilType != null">oil_type,</if>
+            <if test="consumerId != null">consumer_id,</if>
+            <if test="consumer != null">consumer,</if>
+            <if test="amt != null">amt,</if>
+            <if test="orderLiters != null">order_liters,</if>
+            <if test="payType != null">pay_type,</if>
+            <if test="payWay != null">pay_way,</if>
+            <if test="payDate != null">pay_date,</if>
+            <if test="oilPersonnel != null">oil_personnel,</if>
+            <if test="orderType != null">order_type,</if>
+            <if test="printNum != null">print_num,</if>
+            <if test="classStructureNo != null">class_structure_no,</if>
+            <if test="classStartDate != null">class_start_date,</if>
+            <if test="classStructureDate != null">class_structure_date,</if>
+            <if test="classStructureMan != null">class_structure_man,</if>
+            <if test="oils != null">oils,</if>
+            <if test="receivableAmt != null">receivable_amt,</if>
+            <if test="receivedAmt != null">received_amt,</if>
+            <if test="discountAmt != null">discount_amt,</if>
+            <if test="discountCouponAmt != null">discount_coupon_amt,</if>
+            <if test="discountCoupon != null">discount_coupon,</if>
+            <if test="wxAmt != null">wx_amt,</if>
+            <if test="zfbAmt != null">zfb_amt,</if>
+            <if test="posAmt != null">pos_amt,</if>
+            <if test="xjAmt != null">xj_amt,</if>
+            <if test="didiAppAmt != null">didi_app_amt,</if>
+            <if test="tyAppAmt != null">ty_app_amt,</if>
+            <if test="otherAmt != null">other_amt,</if>
+            <if test="dzkAmt != null">dzk_amt,</if>
+            <if test="score != null">score,</if>
+            <if test="memberNo != null">member_no,</if>
+            <if test="memberAmt != null">member_amt,</if>
+            <if test="carNo != null">car_no,</if>
+            <if test="customerPhone != null">customer_phone,</if>
+            <if test="customerGrade != null">customer_grade,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderNo != null">#{orderNo},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="oilGun != null">#{oilGun},</if>
+            <if test="oilName != null">#{oilName},</if>
+            <if test="oilPirce != null">#{oilPirce},</if>
+            <if test="oilType != null">#{oilType},</if>
+            <if test="consumerId != null">#{consumerId},</if>
+            <if test="consumer != null">#{consumer},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="orderLiters != null">#{orderLiters},</if>
+            <if test="payType != null">#{payType},</if>
+            <if test="payWay != null">#{payWay},</if>
+            <if test="payDate != null">#{payDate},</if>
+            <if test="oilPersonnel != null">#{oilPersonnel},</if>
+            <if test="orderType != null">#{orderType},</if>
+            <if test="printNum != null">#{printNum},</if>
+            <if test="classStructureNo != null">#{classStructureNo},</if>
+            <if test="classStartDate != null">#{classStartDate},</if>
+            <if test="classStructureDate != null">#{classStructureDate},</if>
+            <if test="classStructureMan != null">#{classStructureMan},</if>
+            <if test="oils != null">#{oils},</if>
+            <if test="receivableAmt != null">#{receivableAmt},</if>
+            <if test="receivedAmt != null">#{receivedAmt},</if>
+            <if test="discountAmt != null">#{discountAmt},</if>
+            <if test="discountCouponAmt != null">#{discountCouponAmt},</if>
+            <if test="discountCoupon != null">#{discountCoupon},</if>
+            <if test="wxAmt != null">#{wxAmt},</if>
+            <if test="zfbAmt != null">#{zfbAmt},</if>
+            <if test="posAmt != null">#{posAmt},</if>
+            <if test="xjAmt != null">#{xjAmt},</if>
+            <if test="didiAppAmt != null">#{didiAppAmt},</if>
+            <if test="tyAppAmt != null">#{tyAppAmt},</if>
+            <if test="otherAmt != null">#{otherAmt},</if>
+            <if test="dzkAmt != null">#{dzkAmt},</if>
+            <if test="score != null">#{score},</if>
+            <if test="memberNo != null">#{memberNo},</if>
+            <if test="memberAmt != null">#{memberAmt},</if>
+            <if test="carNo != null">#{carNo},</if>
+            <if test="customerPhone != null">#{customerPhone},</if>
+            <if test="customerGrade != null">#{customerGrade},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationClassStructure" parameterType="com.platform.yijia.pojo.StationClassStructure">
+        update station_class_structure
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderNo != null">order_no = #{orderNo},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="oilGun != null">oil_gun = #{oilGun},</if>
+            <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="oilPirce != null">oil_pirce = #{oilPirce},</if>
+            <if test="oilType != null">oil_type = #{oilType},</if>
+            <if test="consumerId != null">consumer_id = #{consumerId},</if>
+            <if test="consumer != null">consumer = #{consumer},</if>
+            <if test="amt != null">amt = #{amt},</if>
+            <if test="orderLiters != null">order_liters = #{orderLiters},</if>
+            <if test="payType != null">pay_type = #{payType},</if>
+            <if test="payWay != null">pay_way = #{payWay},</if>
+            <if test="payDate != null">pay_date = #{payDate},</if>
+            <if test="oilPersonnel != null">oil_personnel = #{oilPersonnel},</if>
+            <if test="orderType != null">order_type = #{orderType},</if>
+            <if test="printNum != null">print_num = #{printNum},</if>
+            <if test="classStructureNo != null">class_structure_no = #{classStructureNo},</if>
+            <if test="classStartDate != null">class_start_date = #{classStartDate},</if>
+            <if test="classStructureDate != null">class_structure_date = #{classStructureDate},</if>
+            <if test="classStructureMan != null">class_structure_man = #{classStructureMan},</if>
+            <if test="oils != null">oils = #{oils},</if>
+            <if test="receivableAmt != null">receivable_amt = #{receivableAmt},</if>
+            <if test="receivedAmt != null">received_amt = #{receivedAmt},</if>
+            <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
+            <if test="discountCouponAmt != null">discount_coupon_amt = #{discountCouponAmt},</if>
+            <if test="discountCoupon != null">discount_coupon = #{discountCoupon},</if>
+            <if test="wxAmt != null">wx_amt = #{wxAmt},</if>
+            <if test="zfbAmt != null">zfb_amt = #{zfbAmt},</if>
+            <if test="posAmt != null">pos_amt = #{posAmt},</if>
+            <if test="xjAmt != null">xj_amt = #{xjAmt},</if>
+            <if test="didiAppAmt != null">didi_app_amt = #{didiAppAmt},</if>
+            <if test="tyAppAmt != null">ty_app_amt = #{tyAppAmt},</if>
+            <if test="otherAmt != null">other_amt = #{otherAmt},</if>
+            <if test="dzkAmt != null">dzk_amt = #{dzkAmt},</if>
+            <if test="score != null">score = #{score},</if>
+            <if test="memberNo != null">member_no = #{memberNo},</if>
+            <if test="memberAmt != null">member_amt = #{memberAmt},</if>
+            <if test="carNo != null">car_no = #{carNo},</if>
+            <if test="customerPhone != null">customer_phone = #{customerPhone},</if>
+            <if test="customerGrade != null">customer_grade = #{customerGrade},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteStationClassStructureById" parameterType="Long">
+        delete from station_class_structure where id = #{id}
+    </delete>
+
+    <delete id="deleteStationClassStructureByIds" parameterType="String">
+        delete from station_class_structure where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 134 - 0
YijiaRestful/src/main/resources/mapper/StationClassesSummaryMapper.xml

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.platform.yijia.dao.StationClassesSummaryMapper">
+
+    <resultMap type="com.platform.yijia.pojo.StationClassesSummary" id="StationClassesSummaryResult">
+        <result property="id"    column="id"    />
+        <result property="classesNo"    column="classes_no"    />
+        <result property="startDate"    column="start_date"    />
+        <result property="endDate"    column="end_date"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="orderNum"    column="order_num"    />
+        <result property="printNum"    column="print_num"    />
+        <result property="saleLiters"    column="sale_liters"    />
+        <result property="saleAmt"    column="sale_amt"    />
+        <result property="amt"    column="amt"    />
+        <result property="discountAmt"    column="discount_amt"    />
+        <result property="wxAmt"    column="wx_amt"    />
+        <result property="zfbAmt"    column="zfb_amt"    />
+        <result property="dzkAmt"    column="dzk_amt"    />
+        <result property="classesMan"    column="classes_man"    />
+    </resultMap>
+
+    <sql id="selectStationClassesSummaryVo">
+        select id, classes_no, start_date, end_date, station_id, station_name, order_num, print_num, sale_liters, sale_amt, amt, discount_amt, wx_amt, zfb_amt, dzk_amt, classes_man from station_classes_summary
+    </sql>
+
+    <select id="selectStationClassesSummaryList" parameterType="com.platform.yijia.pojo.StationClassesSummary" resultMap="StationClassesSummaryResult">
+        <include refid="selectStationClassesSummaryVo"/>
+        <where>
+            <if test="classesNo != null  and classesNo != ''"> and classes_no = #{classesNo}</if>
+            <if test="startDate != null "> and start_date = #{startDate}</if>
+            <if test="endDate != null "> and end_date = #{endDate}</if>
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="orderNum != null "> and order_num = #{orderNum}</if>
+            <if test="printNum != null "> and print_num = #{printNum}</if>
+            <if test="saleLiters != null "> and sale_liters = #{saleLiters}</if>
+            <if test="saleAmt != null "> and sale_amt = #{saleAmt}</if>
+            <if test="amt != null "> and amt = #{amt}</if>
+            <if test="discountAmt != null "> and discount_amt = #{discountAmt}</if>
+            <if test="wxAmt != null "> and wx_amt = #{wxAmt}</if>
+            <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="stationIdList != null ">
+                and station_id in
+                <foreach item="item" index="index" collection="stationIdList"
+                         open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="selectStationClassesSummaryById" parameterType="Long" resultMap="StationClassesSummaryResult">
+        <include refid="selectStationClassesSummaryVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertStationClassesSummary" parameterType="com.platform.yijia.pojo.StationClassesSummary" useGeneratedKeys="true" keyProperty="id">
+        insert into station_classes_summary
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="classesNo != null">classes_no,</if>
+            <if test="startDate != null">start_date,</if>
+            <if test="endDate != null">end_date,</if>
+            <if test="stationId != null">station_id,</if>
+            <if test="stationName != null">station_name,</if>
+            <if test="orderNum != null">order_num,</if>
+            <if test="printNum != null">print_num,</if>
+            <if test="saleLiters != null">sale_liters,</if>
+            <if test="saleAmt != null">sale_amt,</if>
+            <if test="amt != null">amt,</if>
+            <if test="discountAmt != null">discount_amt,</if>
+            <if test="wxAmt != null">wx_amt,</if>
+            <if test="zfbAmt != null">zfb_amt,</if>
+            <if test="dzkAmt != null">dzk_amt,</if>
+            <if test="classesMan != null">classes_man,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="classesNo != null">#{classesNo},</if>
+            <if test="startDate != null">#{startDate},</if>
+            <if test="endDate != null">#{endDate},</if>
+            <if test="stationId != null">#{stationId},</if>
+            <if test="stationName != null">#{stationName},</if>
+            <if test="orderNum != null">#{orderNum},</if>
+            <if test="printNum != null">#{printNum},</if>
+            <if test="saleLiters != null">#{saleLiters},</if>
+            <if test="saleAmt != null">#{saleAmt},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="discountAmt != null">#{discountAmt},</if>
+            <if test="wxAmt != null">#{wxAmt},</if>
+            <if test="zfbAmt != null">#{zfbAmt},</if>
+            <if test="dzkAmt != null">#{dzkAmt},</if>
+            <if test="classesMan != null">#{classesMan},</if>
+         </trim>
+    </insert>
+
+    <update id="updateStationClassesSummary" parameterType="com.platform.yijia.pojo.StationClassesSummary">
+        update station_classes_summary
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="classesNo != null">classes_no = #{classesNo},</if>
+            <if test="startDate != null">start_date = #{startDate},</if>
+            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</if>
+            <if test="printNum != null">print_num = #{printNum},</if>
+            <if test="saleLiters != null">sale_liters = #{saleLiters},</if>
+            <if test="saleAmt != null">sale_amt = #{saleAmt},</if>
+            <if test="amt != null">amt = #{amt},</if>
+            <if test="discountAmt != null">discount_amt = #{discountAmt},</if>
+            <if test="wxAmt != null">wx_amt = #{wxAmt},</if>
+            <if test="zfbAmt != null">zfb_amt = #{zfbAmt},</if>
+            <if test="dzkAmt != null">dzk_amt = #{dzkAmt},</if>
+            <if test="classesMan != null">classes_man = #{classesMan},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteStationClassesSummaryById" parameterType="Long">
+        delete from station_classes_summary where id = #{id}
+    </delete>
+
+    <delete id="deleteStationClassesSummaryByIds" parameterType="String">
+        delete from station_classes_summary where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

+ 1 - 1
YijiaRestful/src/main/resources/mapper/StationInfoMapper.xml

@@ -473,7 +473,7 @@
   </select>
 
   <!--查询油站小程序AppId和AppSecret-->
-  <select id="getStationAppIdAndAppSecret" parameterType="String" resultType="Map">
+  <select id="getStationAppIdAndAppSecret" parameterType="Integer" resultType="Map">
     SELECT
         app_id          AS appId,
         app_secret      AS appSecret