修改

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

@@ -257,7 +257,7 @@ public class ElectronicMembershipCardController {
     @Transactional
     public  String dzkPaySet(@RequestParam String ordNo) throws ParseException {
         Gson gson =new Gson();
-        ResultData resultData =ResultData.success(CodeMsg.SELECT_ORDER_ERROR);
+        ResultData resultData =null;
         if(ordNo !=null){
             PayOrder payOrder = new PayOrder();
             payOrder.setOrderNo(ordNo);
@@ -336,6 +336,7 @@ public class ElectronicMembershipCardController {
                     payOrder.setStatus("1");
                     payOrder.setPayDate(new Date());    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(amt));
+                    payOrder.setDzkAmt(Double.valueOf(amt));
                     payOrderService.getUpdatePayOrder(payOrder);
                     //更新客户表
                     CustomerManage customerManage = new CustomerManage();
@@ -443,8 +444,12 @@ public class ElectronicMembershipCardController {
                 resultData=ResultData.error(CodeMsg.NO_ORDER);
             }
         }
-
-        return gson.toJson(resultData);
+        if(resultData !=null) {
+            return gson.toJson(resultData);
+        }else {
+            resultData = ResultData.error(CodeMsg.SELECT_ORDER_ERROR);
+            return gson.toJson(resultData);
+        }
     }
 
     //用户充值电子会员卡（储蓄卡）拉起随行付支付接口

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

@@ -545,6 +545,7 @@ public class PayController {
                     payOrder.setOrderNo(ordNo);
                     payOrder.setStatus("1");
                     payOrder.setPayType("wx");
+                    payOrder.setWxAmt(Double.valueOf(amt));
                     payOrder.setPayDate(new Date());    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
                     //修改订单状态

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

@@ -38,60 +38,6 @@ public class PayOrderController {
     private PayOrderMapper payOrderMapper;
     @Resource
     private ElectronicMembershipCardService electronicMembershipCardService;
-    @Resource
-    private WxPushUtil wxPushUtil;
-    @Resource
-    private IntegralRuleService integralRuleService;
-    @Resource
-    private CustomerPointsService customerPointsService;
-    @Resource
-    private CustomerPointsRecordService customerPointsRecordService;
-    @Resource
-    private GzhNewsTemplateService gzhNewsTemplateService;
-    @Resource
-    private CustomerManagerService customerManagerService;
-
-    //一键支付，生成订单
-    @RequestMapping(value = "/AddPayOrderInfo", consumes = "application/json", method = RequestMethod.POST)
-    @ResponseBody
-    public String  AddPayOrderInfo(@RequestBody PayOrderRequest payOrderRequest){
-        logger.info("获取订单前端传来参数openID："+ payOrderRequest.getOpenId());
-        logger.info("获取订单前端传来参数userType："+ payOrderRequest.getUserType());
-        Gson gson =new Gson();
-        ResultData resultData =null;
-        //根据token 和登录类型 身份验证
-        AppUserInfo appUserInfo =new AppUserInfo();
-        //订单类型 是小程序还是公众号
-        appUserInfo.setUserType(payOrderRequest.getUserType());
-        if(payOrderRequest.getUserType().equals("1")){
-            //1 是公众号
-            appUserInfo.setBlogOpenid(payOrderRequest.getOpenId());
-        }else if(payOrderRequest.getUserType().equals("2")){
-            //2是小程序
-            appUserInfo.setMinaOpenid(payOrderRequest.getOpenId());
-        }
-        List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
-        //判断登录人员是否验证成功
-        if(appUserInfoList!=null&&appUserInfoList.size()>0){
-            PayOrder payOrder=new PayOrder();
-            payOrder.setConsumer(appUserInfoList.get(0).getBlogNickName()); //昵称
-            payOrder.setConsumerId(appUserInfoList.get(0).getUserId()); //用户id
-            //添加订单信息，返回订单号
-            String ordNo =payOrderService.AddPayOrderInfo(payOrderRequest, payOrder);
-            if(ordNo.equals("0")){
-                resultData=ResultData.error(CodeMsg.CHECK_DATA);
-            }else if(ordNo.equals("1")){
-                resultData=ResultData.error(CodeMsg.PARAMS_NUll);
-            }else {
-                resultData=ResultData.success(ordNo);
-            }
-        }else{
-            //登录人验证失败
-            resultData=ResultData.error(CodeMsg.USER_NOT_EXSIST);
-        }
-        return gson.toJson(resultData);
-    }
-
 
     //小程序支付生成订单
     @RequestMapping(value = "/AddPayOrderInfoNew", consumes = "application/json", method = RequestMethod.POST)
@@ -110,7 +56,6 @@ public class PayOrderController {
             appUserInfo.setMinaOpenid(payOrderRequest.getOpenId());   //2是小程序
         }
         List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
-        //logger.info("用户信息：" + appUserInfoList.toString());
         Map<String ,Object> resultMap = new HashMap<>();            //返回结果集
         //判断登录人员是否验证成功
         if(appUserInfoList!=null && appUserInfoList.size()>0){
@@ -149,13 +94,12 @@ public class PayOrderController {
             payOrder.setCreatedDate(new Date());                    //创建时间
             payOrder.setOrderType(payOrderRequest.getOrderType());  //订单类型
             payOrder.setOilGun(payOrderRequest.getOilGun());        //油枪号
-            //根据油站和油枪获取加油员和油品价格 油站名称
+            //根据油站和油枪获取加油员
             HashMap<String, Object> params = new HashMap<>();
             params.put("oliGunNo", payOrderRequest.getOilGun());
             params.put("stationId", payOrderRequest.getStationId());
             String oilPersonnel = "";
-            //使用list原因：一个枪号对应多个加油员场景
-            List<Map> mapResultList = payOrderMapper.selectPersonelName(params);
+            List<Map> mapResultList = payOrderMapper.selectPersonelName(params);    //使用list原因：一个枪号对应多个加油员场景
             logger.info("加油员信息："+ mapResultList.toString());
             if(mapResultList != null && mapResultList.size() > 0){
                 for (Map per : mapResultList){
@@ -180,7 +124,7 @@ public class PayOrderController {
                 //查询油站是否开启电子会员卡功能
                 if(stationCardEnabledFlag.equals("1")){
                     Map<String, String> map = this.selectCardBalance(payOrderRequest.getStationId(), payOrderRequest.getOilName(), appUserInfoList.get(0).getUnionId());
-                    resultMap.put("balance", map.get("balance"));   //电子卡余额
+                    resultMap.put("balance", map.get("balance"));               //电子卡余额
                     resultMap.put("cardOilsType", map.get("cardOilsType"));     //电子卡类型1.汽油； 2.柴油
                 }
             }
@@ -304,7 +248,7 @@ public class PayOrderController {
             stationOilPrice.setOilName(oilName);
             StationOilPrice oilPriceInfo = stationService.getStationOilPrice(stationOilPrice);
             String oilPrice = oilPriceInfo.getOilPrice();
-            String stationNanme = oilPriceInfo.getStationNanme();
+            //String stationNanme = oilPriceInfo.getStationNanme();
             BigDecimal oilLiters = null;
             BigDecimal discountAmt =null;
             BigDecimal discountPrice = null;

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

@@ -110,6 +110,40 @@ public class PosMachineController {
     }
 
     /*
+     * 查询订单列表
+     * @param stationId
+     * @param userName
+     * @return
+     */
+    @RequestMapping (value = "/getStationClassesSummaryList", method = RequestMethod.GET)
+    @ResponseBody
+    public String getStationClassesSummaryList(@RequestParam String classStructureTime, Integer stationId) throws ParseException {
+        Gson gson =new Gson();
+        //返回结果集
+        ResultData resultData = null;
+        if(stationId !=null){
+            StationClassesSummary stationClassesSummary = new StationClassesSummary();
+            stationClassesSummary.setStationId(stationId);
+            if(classStructureTime !=null && classStructureTime !=""){
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                stationClassesSummary.setStartDate(sdf.parse(classStructureTime));
+                Calendar c = Calendar.getInstance();
+                c.setTime(sdf.parse(classStructureTime));
+                c.add(Calendar.DAY_OF_MONTH,+1);
+                stationClassesSummary.setEndDate(c.getTime());
+            }
+            List<Map> stationClassesSummariesList = stationClassesSummaryService.getStationClassesSummaryList(stationClassesSummary);
+            resultData = ResultData.success(stationClassesSummariesList);
+        }else {
+            resultData = ResultData.success(CodeMsg.REQUEST_FAIL);
+        }
+
+        return  gson.toJson(resultData);
+    }
+
+
+
+    /*
      * 获取班结人要班结的订单总和信息
      * @param stationId
      * @param userName
@@ -331,6 +365,7 @@ public class PosMachineController {
             PayOrder order=new PayOrder();
             order.setStationId(stationId);
             order.setEndTime(dateFormat.format(date));
+            order.setStatus("1");
             List<PayOrder> list = payOrderService.selectPayOrderList(order);
             for(PayOrder payOrder:list){
                 StationClassStructure stationclass =new StationClassStructure();
@@ -441,7 +476,6 @@ public class PosMachineController {
             if(stationclass.getClassStructureDate()!=null){
                 stationClassesSummary.setEndDate(stationclass.getClassStructureDate());
             }
-
             stationClassesSummary.setStationName(stationclass.getStationName());
             if(stationclass.getStationId()!=null){
                 stationClassesSummary.setStationId(stationclass.getStationId());
@@ -451,6 +485,8 @@ public class PosMachineController {
             }
             if(stationclass.getPrintNum()!=null){
                 stationClassesSummary.setPrintNum(stationclass.getPrintNum());
+            }else {
+                stationClassesSummary.setPrintNum(Integer.valueOf(0));
             }
             if(stationclass.getOrderLiters()!=null){
                 stationClassesSummary.setSaleLiters(stationclass.getOrderLiters());
@@ -474,25 +510,24 @@ public class PosMachineController {
             }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("code","200");
+                map.put("retCode","0");
                 map.put("msg","班结成功");
-//                //查询班结小票数据
-//                StationClassStructure classStructure= new StationClassStructure();
-//                classStructure.setClassStructureNo(no);
-//                classStructure.setStationId(stationId);
-//                //根据油品汇总数据
-//                List<StationClassStructure> list= stationClassStructureService.listOilStructure(classStructure);
-//                if(list!=null && list.size()>0){
-//                    map.put("code","200");
-//                    map.put("msg","班结成功");
-//                    map.put("oilList",list);
-//                }
             }
         }else{
-            map.put("code","100");
+            map.put("retCode","-1");
             map.put("msg","已班结");
         }
         return map;

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

@@ -3,6 +3,7 @@ package com.platform.yijia.dao;
 import com.platform.yijia.pojo.StationClassesSummary;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -12,6 +13,10 @@ import java.util.List;
  */
 public interface StationClassesSummaryMapper
 {
+
+    //获取班结汇总数据
+    List<Map> getStationClassesSummaryList(StationClassesSummary stationClassesSummary);
+
     /**
      * 查询【请填写功能名称】
      *

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

@@ -24,12 +24,7 @@ public class StationClassesSummary
     /** 班次号 */
     private String classesNo;
 
-    /** 班次开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
-
-    /** 班次结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
 
     /** 油站id */

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

@@ -3,6 +3,7 @@ package com.platform.yijia.service;
 import com.platform.yijia.pojo.StationClassesSummary;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】Service接口
@@ -12,6 +13,10 @@ import java.util.List;
  */
 public interface IStationClassesSummaryService
 {
+
+    //获取班结汇总数据
+    List<Map> getStationClassesSummaryList(StationClassesSummary stationClassesSummary);
+
     /**
      * 查询【请填写功能名称】
      *

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

@@ -13,9 +13,6 @@ public interface PayOrderService {
     //查询汇总数据
     List<Map> selectSum(PayOrder payOrder);
 
-    //订单信息数据落地
-     String AddPayOrderInfo(PayOrderRequest payOrderRequest, PayOrder payOrder);
-
      //根据订单号查询订单信息
      List<PayOrder> getPayOrderList(String orderNo);
 

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

@@ -20,193 +20,11 @@ import java.util.*;
 
 @Service("payOrderService")
 public class PayOrderServiceImpl implements PayOrderService {
-    @Resource
-    private CustomerGradeMapper customerGradeMapper;
+
     @Resource
     private PayOrderMapper payOrderMapper;
-    @Resource
-    private AppUserInfoService appUserInfoService;
-    @Resource
-    private StationService stationService;
-    @Resource
-    private CustomerGradeServices customerGradeServices;
-    @Resource
-    private ElectronicMembershipCardService electronicMembershipCardService;
-
-    /*
-     * 添加订单信息
-     * @param payOrderRequest
-     * @param payOrder
-     * @return
-     */
-    @Override
-    @Transactional
-    public String AddPayOrderInfo(PayOrderRequest payOrderRequest, PayOrder payOrder) {
-
-        //订单规则 时间+6位随机数
-        Random random = new Random();
-        String result="";
-        for(int i=0;i<6;i++){
-            result+=random.nextInt(10);
-        }
-        //System.out.println("随机生成6位数result ："+result);
-        String ordNo=System.nanoTime()+result;
-        payOrder.setOrderNo(ordNo);
-        payOrder.setDiscountCouponAmt(payOrderRequest.getDiscountCouponAmt());  //优惠劵金额
-        payOrder.setDiscountCoupon(payOrderRequest.getDiscountCoupon());        //优惠券
-        payOrder.setCarNo(payOrderRequest.getCarNo());  //车牌号、
-        payOrder.setCustomerGrade(payOrderRequest.getCustomerGrade());    //客户电话
-        payOrder.setMemberNo(payOrderRequest.getMemberNo());     //会员卡号
-        payOrder.setMemberAmt(payOrderRequest.getMemberAmt());    //会员支付金额
-        //payOrder.setPrintCount(payOrderRequest.getPrintCount());    //小票数量
-        payOrder.setScore(payOrderRequest.getScore());      //积分
-        payOrder.setStationId(payOrderRequest.getStationId());  //油站id
-        payOrder.setStatus("0");         //创建订单 未支付状态 0
-        if(StringUtils.isNotBlank(payOrderRequest.getUserType())&& payOrderRequest.getUserType().equals("1")){
-            payOrder.setPayWay("02");        //支付方式：02公众号，03小程序',
-            payOrder.setWxAmt(Double.valueOf(payOrderRequest.getAmt()));    //微信支付金额
-            payOrder.setPayType("wx");      //支付类型
-        }else if(StringUtils.isNotBlank(payOrderRequest.getUserType())&& payOrderRequest.getUserType().equals("2")){
-            payOrder.setPayWay("03");
-            payOrder.setWxAmt(Double.valueOf(payOrderRequest.getAmt()));    //微信支付金额
-            payOrder.setPayType("wx");      //支付类型
-        }
-        payOrder.setCreatedDate(new Date());                    //创建时间
-        payOrder.setOrderType(payOrderRequest.getOrderType());  //订单类型
-        payOrder.setOilGun(payOrderRequest.getOilGun());        //油枪号
-
-        //根据油站和油枪获取加油员和油品价格 油站名称
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("oliGunNo", payOrderRequest.getOilGun());
-        params.put("stationId", payOrderRequest.getStationId());
-        String oilPersonnel = "";
-        //使用list原因：一个枪号对应多个加油员场景
-        List<Map> mapResultList = payOrderMapper.selectPersonelName(params);
-        if(mapResultList != null && mapResultList.size() > 0){
-            for (Map per : mapResultList){
-                if(per.containsKey("personelName") && per.get("personelName").toString() !=null && per.get("personelName").toString() !=""){
-                    oilPersonnel += per.get("personelName").toString() +",";
-                }
-            }
-            if(oilPersonnel !=""){
-                payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
-            }
-            if(mapResultList.get(0).containsKey("stationName") && mapResultList.get(0).get("stationName").toString() !="" && mapResultList.get(0).get("stationName").toString() !=null ){
-                payOrder.setStationName(mapResultList.get(0).get("stationName").toString());        //油站名称
-            }
-        }
-
-        //订单类型等于1时表示油品
-        if(payOrderRequest.getOrderType().equals("1")){
-            Double receivableAmt = payOrderRequest.getReceivableAmt();  //获取应收金额
-            payOrder.setReceivableAmt(receivableAmt);
-            Double oilPrice = payOrderRequest.getOilPrice();            //获取油价
-            payOrder.setOilPirce(String.valueOf(oilPrice));
-
-            Double oilLitersCheck= null;    //加油升数校验
-            if(receivableAmt != null && oilPrice != null){
-                //计算加油升数
-                oilLitersCheck = recKonOrderLiters(receivableAmt, oilPrice, 2);
-                payOrder.setOrderLiters(String.valueOf(oilLitersCheck));
 
-                //实收金额 优惠金额
-                payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));
-                payOrder.setDiscountAmt(payOrderRequest.getDiscountAmt());
-
-
-
-
-                String oilName = payOrderRequest.getOilName();
-                payOrder.setOilName(oilName);      //油品名称
-                //根据油品名称存储油品类型 1.柴油 2 汽油
-                switch (oilName){
-                    case "92#":
-                        payOrder.setOilType("2");
-                        break;
-                    case "95#":
-                        payOrder.setOilType("2");
-                        break;
-                    case "97#":
-                        payOrder.setOilType("2");
-                        break;
-                    case "0#":
-                        payOrder.setOilType("1");
-                        break;
-                    case "-10#":
-                        payOrder.setOilType("1");
-                        break;
-                    case "-20#":
-                        payOrder.setOilType("1");
-                        break;
-                }
-                //数据落地
-                payOrderMapper.insertSelective(payOrder);
-                //根据订单号查询出订单
-                PayOrderExample example=new PayOrderExample();
-                example.or().andOrderNoEqualTo(ordNo);
-                //根据订单号查询返回列表，最好是返回对象
-                List<PayOrder> payOrderList= payOrderMapper.selectByExample(example);
-                //返回订单号
-                ordNo= payOrderList.get(0).getOrderNo();
-            }else {
-                ordNo = "1";
-            }
-        }else if(payOrderRequest.getOrderType().equals("2")){       //订单类型等于2时表示非油品
-            String oilName = payOrderRequest.getOilName();
-            payOrder.setOilName(oilName);      //非油品名称
-            Map<String, String> m = stationService.getStationAppIdAndAppSecret(payOrderRequest.getStationId());
-            if(m.containsKey("stationName") && m.get("stationName") !=null){
-                payOrder.setStationName(m.get("stationName"));
-            }
-            payOrder.setReceivableAmt(payOrderRequest.getReceivableAmt());  //非油品应收金额
-            payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));  //非油品金额
-            //数据落地
-            payOrderMapper.insertSelective(payOrder);
-            //根据订单号查询出订单
-            PayOrderExample example=new PayOrderExample();
-            example.or().andOrderNoEqualTo(ordNo);
-            //根据订单号查询返回列表，最好是返回对象
-            List<PayOrder> payOrderList= payOrderMapper.selectByExample(example);
-            //返回订单号
-            ordNo= payOrderList.get(0).getOrderNo();
-        }
-        return ordNo;
-    }
-
-    /*
-     * 计算加油升数
-     * @param str1
-     * @param str2
-     * @param scale 保留小数位数
-     * @return String
-     */
-    public Double recKonOrderLiters(Double str1, Double str2, int scale){
-        return  new BigDecimal(str1).divide(new BigDecimal(str2), scale, BigDecimal.ROUND_HALF_UP).doubleValue();
-    }
-
-    /*
-     * 判断油价生效时间是否小于当前时间
-     * @param takeEffectDate
-     * @return boolean
-     */
-    public boolean compareEffectTime(String takeEffectDate){
-        boolean flag = false;
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd hh:mm");
-        try {
-            Date teDate = df.parse(takeEffectDate);
-            String currentTime = df.format(new Date());
-            if(teDate.getTime() <= df.parse(currentTime).getTime()){
-                flag = true;
-            }
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return flag;
-    }
-
-    /*
-     * 查询订单信息
-     * */
+    //查询订单信息
     @Override
     public List<PayOrder> getPayOrderList(String orderNo) {
         PayOrderExample example =new PayOrderExample();

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

@@ -1,6 +1,7 @@
 package com.platform.yijia.service.impl;
 
 import java.util.List;
+import java.util.Map;
 
 import com.platform.yijia.dao.StationClassesSummaryMapper;
 import com.platform.yijia.pojo.StationClassesSummary;
@@ -21,6 +22,11 @@ public class StationClassesSummaryServiceImpl implements IStationClassesSummaryS
     @Resource
     private StationClassesSummaryMapper stationClassesSummaryMapper;
 
+    @Override
+    public List<Map> getStationClassesSummaryList(StationClassesSummary stationClassesSummary) {
+        return stationClassesSummaryMapper.getStationClassesSummaryList(stationClassesSummary);
+    }
+
     /**
      * 查询【请填写功能名称】
      *

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

@@ -879,6 +879,12 @@
         <if test="payType != null">
           pay_type = #{payType,jdbcType=VARCHAR},
         </if>
+        <if test="wxAmt != null">
+            wx_amt = #{wxAmt,jdbcType=DOUBLE},
+        </if>
+        <if test="dzkAmt != null">
+            dzk_amt = #{dzkAmt,jdbcType=DOUBLE},
+        </if>
         <if test="payDate != null">
           pay_date = #{payDate,jdbcType=TIMESTAMP},
         </if>

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

@@ -149,8 +149,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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(amt) as amt,class_structure_man
+        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(amt) as amt,
+            sum(wx_amt) as wx_amt,
+            sum(zfb_amt) as zfb_amt,
+            sum(pos_amt) as pos_amt,
+            sum(dzk_amt) as dzk_amt,
+            sum(xj_amt) as xj_amt,
+            sum(other_amt) as other_amt,
+            SUM(print_num)      AS print_num,
+            SUM(discount_amt)   AS discount_amt,
+            class_structure_man
         from station_class_structure
         <where>
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>

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

@@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wxAmt"    column="wx_amt"    />
         <result property="zfbAmt"    column="zfb_amt"    />
         <result property="dzkAmt"    column="dzk_amt"    />
+        <result property="amt"    column="amt"    />
+        <result property="discountAmt"    column="discount_amt"    />
         <result property="classesMan"    column="classes_man"    />
     </resultMap>
 
@@ -25,6 +27,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, classes_no, start_date, end_date, station_id, station_name, order_num, print_num, sale_liters, sale_amt, wx_amt, zfb_amt, dzk_amt, classes_man from station_classes_summary
     </sql>
 
+    <!--POS机获取已班结总和列表-->
+    <select id="getStationClassesSummaryList" parameterType="com.platform.yijia.pojo.StationClassesSummary" resultType="map">
+        SELECT
+            classes_no                                   AS classesNo,
+            classes_man                                  AS classesMan,
+            station_id                                   AS stationId,
+            station_name                                 AS stationName,
+            DATE_FORMAT(start_date, '%Y-%m-%d %H:%i:%s') AS startDate,
+            DATE_FORMAT(end_date, '%Y-%m-%d %H:%i:%s')   AS endDate,
+            order_num                                    AS orderSum,
+            sale_liters                                  AS orderLitersSum,
+            sale_amt                                     AS receivableAmtSum,
+            discount_amt                                 AS discountAmtSum,
+            amt                                          AS amtSum,
+            print_num                                    AS printCountSum
+        FROM
+            station_classes_summary
+        <where>
+            <if test="stationId !=null">
+                station_id= #{stationId}
+            </if>
+            <if test="startDate !=null">
+                AND end_date <![CDATA[ >= ]]> #{startDate}
+            </if>
+            <if test="endDate !=null">
+                AND end_date <![CDATA[ < ]]> #{endDate}
+            </if>
+        </where>
+        ORDER BY end_date DESC
+    </select>
+
+
     <select id="selectStationClassesSummaryList" parameterType="com.platform.yijia.pojo.StationClassesSummary" resultMap="StationClassesSummaryResult">
         <include refid="selectStationClassesSummaryVo"/>
         <where>
@@ -71,6 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wxAmt != null">wx_amt,</if>
             <if test="zfbAmt != null">zfb_amt,</if>
             <if test="dzkAmt != null">dzk_amt,</if>
+            <if test="amt != null">amt,</if>
+            <if test="discountAmt != null">discount_amt,</if>
             <if test="classesMan != null">classes_man,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -86,6 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wxAmt != null">#{wxAmt},</if>
             <if test="zfbAmt != null">#{zfbAmt},</if>
             <if test="dzkAmt != null">#{dzkAmt},</if>
+            <if test="amt != null">#{amt},</if>
+            <if test="discountAmt != null">#{discountAmt},</if>
             <if test="classesMan != null">#{classesMan},</if>
          </trim>
     </insert>