修改pos机班结

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

@@ -1,18 +1,29 @@
 package com.platform.yijia.controller;
 import com.google.gson.Gson;
 import com.platform.yijia.param.request.LoginBody;
+import com.platform.yijia.pojo.PayOrder;
+import com.platform.yijia.pojo.StationClassStructure;
+import com.platform.yijia.pojo.StationClassesSummary;
 import com.platform.yijia.pojo.SysUser;
+import com.platform.yijia.service.IStationClassStructureService;
+import com.platform.yijia.service.IStationClassesSummaryService;
+import com.platform.yijia.service.PayOrderService;
 import com.platform.yijia.service.PosMachineService;
 import com.platform.yijia.utils.CodeMsg;
 import com.platform.yijia.utils.ResultData;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <Title> PosMachineController </Title>
@@ -27,6 +38,15 @@ public class PosMachineController {
     @Resource
     private PosMachineService posMachineService;
 
+    @Resource
+    private IStationClassStructureService stationClassStructureService;
+
+    @Resource
+    private IStationClassesSummaryService stationClassesSummaryService;
+
+    @Resource
+    private PayOrderService payOrderService;
+
     //POS机端用户登录
     @RequestMapping(value = "/loginPosMachine", method = RequestMethod.POST)
     @ResponseBody
@@ -36,15 +56,15 @@ public class PosMachineController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(loginBody.getUsername() !=null && loginBody.getPassword() !=null){
-            SysUser sysUser = posMachineService.selectUserByUserName(loginBody.getUsername());
+        if(loginBody.getUserName() !=null && loginBody.getPassword() !=null){
+            SysUser sysUser = posMachineService.selectUserByUserName(loginBody.getUserName());
             if(sysUser !=null){
                 String password = sysUser.getPassword();
                 BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
                 //密码加密判断已加密密码是否与真实密码相同
                 boolean matches = bCryptPasswordEncoder.matches(loginBody.getPassword(), password);
                 if(matches){
-                    resultData = ResultData.success(CodeMsg.SUCCESS);
+                    resultData = ResultData.success(sysUser);
                 }else{
                     resultData = ResultData.error(CodeMsg.PASSWORD_ERROR);
                 }
@@ -54,4 +74,326 @@ public class PosMachineController {
         }
         return gson.toJson(resultData);
     }
+
+    /**
+     * pos机班结
+     * @param stationClassStructure
+     * @return
+     * @throws ParseException
+     */
+    @RequestMapping (value = "/posClassStructure", method = RequestMethod.POST)
+    @ResponseBody
+    public Map posClassStructure (@RequestBody StationClassStructure stationClassStructure) throws ParseException {
+        Map map = new HashMap();
+        //获取当前班结油站
+        Integer stationId=stationClassStructure.getStationId();
+        //String stationName=stationClassStructure.getStationName();
+        String username = stationClassStructure.getClassStructureMan();
+        //根据油站查询出油站是否班结过，班结过就需要查询上次班结的时间
+        StationClassStructure classes =new StationClassStructure();
+        classes.setStationId(stationId);
+        //查询出上次班结，最后一条数据
+        StationClassStructure sss =stationClassStructureService.selectStationClassStructureMax(classes);
+        String beginTime="";
+        //当前时间
+        Date date= new Date();
+        StationClassStructure classesStructure =new StationClassStructure();
+        classesStructure.setStationId(stationId);
+        DateFormat dFormat = new SimpleDateFormat("yyyyMMdd");
+        String no=dFormat.format(date);
+        classesStructure.setLikeClassStructureNo(no);
+        //查询班结信息中本日班结次数
+        StationClassStructure structure =stationClassStructureService.selectDistnctClassStructure(classesStructure);
+        if(structure!=null){
+            if(structure.getNum()==0){
+                no = no + "0"+1;
+            }else{
+                int num  = structure.getNum()+1;
+                if(num>0 && num<10){
+                    no = no + "0"+num;
+                }else{
+                    no = no +""+ num;
+                }
+            }
+        }
+        int i=0;
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        if(sss!=null){
+            //获取上次班结时间
+            PayOrder order=new PayOrder();
+            order.setStationId(stationId);
+            order.setStatus("1");
+            beginTime= dateFormat.format(sss.getClassStructureDate());
+            order.setBeginTime(beginTime);
+            order.setEndTime( dateFormat.format(date));
+            List<PayOrder> list = payOrderService.selectPayOrderList(order);
+            for(PayOrder payOrder:list){
+                StationClassStructure stationclass =new StationClassStructure();
+                stationclass.setStationId(payOrder.getStationId());
+                stationclass.setStationName(payOrder.getStationName());
+                stationclass.setClassStartDate(dateFormat.parse(beginTime));
+                stationclass.setClassStructureMan(username);
+                stationclass.setClassStructureNo(no);
+                stationclass.setClassStructureDate(date);
+                stationclass.setOrderNo(payOrder.getOrderNo());
+                stationclass.setOilGun(payOrder.getOilGun());
+                stationclass.setOilName(payOrder.getOilName());
+                stationclass.setConsumerId(payOrder.getConsumerId());
+                stationclass.setConsumer(payOrder.getConsumer());
+                stationclass.setAmt(new BigDecimal(payOrder.getAmt()));
+                if(payOrder.getReceivableAmt()!=null){
+                    stationclass.setReceivableAmt(new BigDecimal(payOrder.getReceivableAmt()));
+                }else{
+                    stationclass.setReceivableAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getReceivedAmt()!=null){
+                    stationclass.setReceivedAmt(new BigDecimal(payOrder.getReceivedAmt()));
+                }else{
+                    stationclass.setReceivedAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDiscountAmt()!=null){
+                    stationclass.setDiscountAmt(new BigDecimal(payOrder.getDiscountAmt()));
+                }else{
+                    stationclass.setDiscountAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDiscountCouponAmt()!=null){
+                    stationclass.setDiscountCouponAmt(new BigDecimal(payOrder.getDiscountCouponAmt()));
+                }else{
+                    stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getWxAmt()!=null){
+                    stationclass.setWxAmt(new BigDecimal(payOrder.getWxAmt()));
+                }else{
+                    stationclass.setWxAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getZfbAmt()!=null){
+                    stationclass.setZfbAmt(new BigDecimal(payOrder.getZfbAmt()));
+                }else{
+                    stationclass.setZfbAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getPosAmt()!=null){
+                    stationclass.setPosAmt(new BigDecimal(payOrder.getPosAmt()));
+                }else{
+                    stationclass.setPosAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getXjAmt()!=null){
+                    stationclass.setXjAmt(new BigDecimal(payOrder.getXjAmt()));
+                }else{
+                    stationclass.setXjAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDidiAppAmt()!=null){
+                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getDidiAppAmt()));
+                }else{
+                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getTyAppAmt()!=null){
+                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getTyAppAmt()));
+                }else{
+                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getOtherAmt()!=null){
+                    stationclass.setOtherAmt(new BigDecimal(payOrder.getOtherAmt()));
+                }else{
+                    stationclass.setOtherAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDzkAmt()!=null){
+                    stationclass.setDzkAmt(new BigDecimal(payOrder.getDzkAmt()));
+                }else{
+                    stationclass.setDzkAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getMemberAmt()!=null){
+                    stationclass.setMemberAmt(new BigDecimal(payOrder.getMemberAmt()));
+                }else{
+                    stationclass.setMemberAmt(BigDecimal.valueOf(0));
+                }
+                stationclass.setOrderLiters(new BigDecimal(payOrder.getOrderLiters()));
+                stationclass.setPayWay(payOrder.getPayWay());
+                stationclass.setPayType(payOrder.getPayType());
+                stationclass.setPayDate(payOrder.getPayDate());
+                stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                stationclass.setOrderType(payOrder.getOrderType());
+                if(payOrder.getPrintCount()!=null){
+                    stationclass.setPrintNum(payOrder.getPrintCount());
+                }else{
+                    stationclass.setPrintNum(Integer.valueOf("0"));
+                }
+
+                i= stationClassStructureService.insertStationClassStructure(stationclass);
+            }
+        }else{
+            //初次班结 班结时间默认为当前时间，班结人username
+            //根据班结时间查询订单
+            PayOrder order=new PayOrder();
+            order.setStationId(stationId);
+            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.setClassStructureMan(username);
+                stationclass.setClassStructureDate(date);
+                stationclass.setClassStructureNo(no);
+                stationclass.setOrderNo(payOrder.getOrderNo());
+                stationclass.setOilGun(payOrder.getOilGun());
+                stationclass.setOilName(payOrder.getOilName());
+                stationclass.setConsumerId(payOrder.getConsumerId());
+                stationclass.setConsumer(payOrder.getConsumer());
+                stationclass.setAmt(new BigDecimal(payOrder.getAmt()));
+                if(payOrder.getReceivableAmt()!=null){
+                    stationclass.setReceivableAmt(new BigDecimal(payOrder.getReceivableAmt()));
+                }else{
+                    stationclass.setReceivableAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getReceivedAmt()!=null){
+                    stationclass.setReceivedAmt(new BigDecimal(payOrder.getReceivedAmt()));
+                }else{
+                    stationclass.setReceivedAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDiscountAmt()!=null){
+                    stationclass.setDiscountAmt(new BigDecimal(payOrder.getDiscountAmt()));
+                }else{
+                    stationclass.setDiscountAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDiscountCouponAmt()!=null){
+                    stationclass.setDiscountCouponAmt(new BigDecimal(payOrder.getDiscountCouponAmt()));
+                }else{
+                    stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getWxAmt()!=null){
+                    stationclass.setWxAmt(new BigDecimal(payOrder.getWxAmt()));
+                }else{
+                    stationclass.setWxAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getZfbAmt()!=null){
+                    stationclass.setZfbAmt(new BigDecimal(payOrder.getZfbAmt()));
+                }else{
+                    stationclass.setZfbAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getPosAmt()!=null){
+                    stationclass.setPosAmt(new BigDecimal(payOrder.getPosAmt()));
+                }else{
+                    stationclass.setPosAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getXjAmt()!=null){
+                    stationclass.setXjAmt(new BigDecimal(payOrder.getXjAmt()));
+                }else{
+                    stationclass.setXjAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDidiAppAmt()!=null){
+                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getDidiAppAmt()));
+                }else{
+                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getTyAppAmt()!=null){
+                    stationclass.setDidiAppAmt(new BigDecimal(payOrder.getTyAppAmt()));
+                }else{
+                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getOtherAmt()!=null){
+                    stationclass.setOtherAmt(new BigDecimal(payOrder.getOtherAmt()));
+                }else{
+                    stationclass.setOtherAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDzkAmt()!=null){
+                    stationclass.setDzkAmt(new BigDecimal(payOrder.getDzkAmt()));
+                }else{
+                    stationclass.setDzkAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getMemberAmt()!=null){
+                    stationclass.setMemberAmt(new BigDecimal(payOrder.getMemberAmt()));
+                }else{
+                    stationclass.setMemberAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getOrderLiters() !=null){
+                    stationclass.setOrderLiters(new BigDecimal(payOrder.getOrderLiters()));
+                }else {
+                    stationclass.setOrderLiters(new BigDecimal(0));
+                }
+                stationclass.setPayWay(payOrder.getPayWay());
+                stationclass.setPayType(payOrder.getPayType());
+                stationclass.setPayDate(payOrder.getPayDate());
+                stationclass.setOilPersonnel(payOrder.getOilPersonnel());
+                stationclass.setOrderType(payOrder.getOrderType());
+                if(payOrder.getPrintCount()!=null){
+                    stationclass.setPrintNum(payOrder.getPrintCount());
+                }else{
+                    stationclass.setPrintNum(Integer.valueOf("0"));
+                }
+                i= stationClassStructureService.insertStationClassStructure(stationclass);
+            }
+        }
+        StationClassStructure scs =new StationClassStructure();
+        scs.setClassStructureNo(no);
+        //汇总班结数据将汇总的数据插入到汇总数据中
+        StationClassStructure stationclass = stationClassStructureService.selectSummyClassStructure(scs);
+        if(stationclass!=null){
+            StationClassesSummary stationClassesSummary =new StationClassesSummary();
+            stationClassesSummary.setClassesNo(stationclass.getClassStructureNo());
+            if(stationclass.getClassStartDate()!=null){
+                stationClassesSummary.setStartDate(stationclass.getClassStartDate());
+            }
+            if(stationclass.getClassStructureDate()!=null){
+                stationClassesSummary.setEndDate(stationclass.getClassStructureDate());
+            }
+
+            stationClassesSummary.setStationName(stationclass.getStationName());
+            if(stationclass.getStationId()!=null){
+                stationClassesSummary.setStationId(stationclass.getStationId());
+            }
+            if(stationclass.getNum()!=null){
+                stationClassesSummary.setOrderNum(Integer.valueOf(stationclass.getNum()));
+            }
+            if(stationclass.getPrintNum()!=null){
+                stationClassesSummary.setPrintNum(stationclass.getPrintNum());
+            }
+            if(stationclass.getOrderLiters()!=null){
+                stationClassesSummary.setSaleLiters(stationclass.getOrderLiters());
+            }
+            if(stationclass.getAmt()!=null){
+                stationClassesSummary.setSaleAmt(stationclass.getAmt());
+            }
+            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));
+            }
+            stationClassesSummary.setClassesMan(stationclass.getClassStructureMan());
+            i=stationClassesSummaryService.insertStationClassesSummary(stationClassesSummary);
+            if(i==1){
+                //查询班结小票数据
+                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","500");
+                    map.put("msg","班结失败");
+                }
+            }
+        }else{
+            map.put("code","500");
+            map.put("msg","班结失败");
+        }
+        return map;
+    }
+
+
+
 }

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

@@ -1,392 +0,0 @@
-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;
-    }
-}

YijiaRestful/src/main/java/com/platform/yijia/param/request/LoginBody.java

@@ -10,7 +10,7 @@ public class LoginBody {
     /**
      * 用户名
      */
-    private String username;
+    private String userName;
 
     /**
      * 用户密码

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

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+       	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(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>
@@ -149,10 +149,8 @@ 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(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
+        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
         from station_class_structure
         <where>
             <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
@@ -182,66 +180,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </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
@@ -381,15 +319,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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>

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

@@ -15,8 +15,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <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"    />
@@ -24,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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
+        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>
 
     <select id="selectStationClassesSummaryList" parameterType="com.platform.yijia.pojo.StationClassesSummary" resultMap="StationClassesSummaryResult">
@@ -39,20 +37,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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 test="beginTime != null and beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(end_date,'%Y-%m-%d %H:%i:%s') &gt;= date_format(#{beginTime},'%Y-%m-%d %H:%i:%s')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(end_date,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
+        order by id desc
     </select>
 
     <select id="selectStationClassesSummaryById" parameterType="Long" resultMap="StationClassesSummaryResult">
@@ -72,8 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -89,8 +83,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -110,8 +102,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <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>
@@ -120,15 +110,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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>