修改班结信息

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -263,6 +263,12 @@ public class StationClassStructureController extends BaseController
                 stationclass.setPayDate(payOrder.getPayDate());
                 stationclass.setOilPersonnel(payOrder.getOilPersonnel());
                 stationclass.setOrderType(payOrder.getOrderType());
+                if(payOrder.getPrintCount()!=null){
+                    stationclass.setPrintNum(payOrder.getPrintCount());
+                }else{
+                    stationclass.setPrintNum(Long.valueOf("0"));
+                }
+
                 i= stationClassStructureService.insertStationClassStructure(stationclass);
             }
         }else{
@@ -285,16 +291,82 @@ public class StationClassStructureController extends BaseController
                 stationclass.setConsumerId(payOrder.getConsumerId());
                 stationclass.setConsumer(payOrder.getConsumer());
                 stationclass.setAmt(payOrder.getAmt());
-                if(payOrder.getOrderLiters()!=null){
-                    stationclass.setOrderLiters(payOrder.getOrderLiters());
+                if(payOrder.getReceivableAmt()!=null){
+                    stationclass.setReceivableAmt(payOrder.getReceivableAmt());
+                }else{
+                    stationclass.setReceivableAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getReceivedAmt()!=null){
+                    stationclass.setReceivedAmt(payOrder.getReceivedAmt());
+                }else{
+                    stationclass.setReceivedAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDiscountAmt()!=null){
+                    stationclass.setDiscountAmt(payOrder.getDiscountAmt());
+                }else{
+                    stationclass.setDiscountAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDiscountCouponAmt()!=null){
+                    stationclass.setDiscountCouponAmt(payOrder.getDiscountCouponAmt());
+                }else{
+                    stationclass.setDiscountCouponAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getWxAmt()!=null){
+                    stationclass.setWxAmt(payOrder.getWxAmt());
+                }else{
+                    stationclass.setWxAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getZfbAmt()!=null){
+                    stationclass.setZfbAmt(payOrder.getZfbAmt());
+                }else{
+                    stationclass.setZfbAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getPosAmt()!=null){
+                    stationclass.setPosAmt(payOrder.getPosAmt());
+                }else{
+                    stationclass.setPosAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getXjAmt()!=null){
+                    stationclass.setXjAmt(payOrder.getXjAmt());
+                }else{
+                    stationclass.setXjAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDidiAppAmt()!=null){
+                    stationclass.setDidiAppAmt(payOrder.getDidiAppAmt());
+                }else{
+                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
                 }
+                if(payOrder.getTyAppAmt()!=null){
+                    stationclass.setDidiAppAmt(payOrder.getTyAppAmt());
+                }else{
+                    stationclass.setDidiAppAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getOtherAmt()!=null){
+                    stationclass.setOtherAmt(payOrder.getOtherAmt());
+                }else{
+                    stationclass.setOtherAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getDzkAmt()!=null){
+                    stationclass.setDzkAmt(payOrder.getDzkAmt());
+                }else{
+                    stationclass.setDzkAmt(BigDecimal.valueOf(0));
+                }
+                if(payOrder.getMemberAmt()!=null){
+                    stationclass.setMemberAmt(payOrder.getMemberAmt());
+                }else{
+                    stationclass.setMemberAmt(BigDecimal.valueOf(0));
+                }
+                stationclass.setOrderLiters(payOrder.getOrderLiters());
                 stationclass.setPayWay(payOrder.getPayWay());
                 stationclass.setPayType(payOrder.getPayType());
                 stationclass.setPayDate(payOrder.getPayDate());
                 stationclass.setOilPersonnel(payOrder.getOilPersonnel());
                 stationclass.setOrderType(payOrder.getOrderType());
-                stationclass.setOilType(payOrder.getOilType());
-                stationclass.setPrintNum(payOrder.getPrintCount());
+                if(payOrder.getPrintCount()!=null){
+                    stationclass.setPrintNum(payOrder.getPrintCount());
+                }else{
+                    stationclass.setPrintNum(Long.valueOf("0"));
+                }
                 i= stationClassStructureService.insertStationClassStructure(stationclass);
             }
         }
@@ -385,13 +457,13 @@ public class StationClassStructureController extends BaseController
                     if( str.getReceivableAmt()==null){
                         str.setReceivableAmt(BigDecimal.valueOf(0));
                     }
-                    if( str.getDiscountCouponAmt()==null){
-                        str.setDiscountCouponAmt(BigDecimal.valueOf(0));
+                    if( str.getDiscountAmt()==null){
+                        str.setDiscountAmt(BigDecimal.valueOf(0));
                     }
                     if( str.getOrderNo()==null){
                         str.setOrderNo(String.valueOf(0));
                     }
-                    content += str.getOilName()+"  "+str.getOrderLiters()+"  "+str.getAmt()+"  "+str.getOrderNo()+"  "+str.getDiscountCouponAmt()+ " <BR>";
+                    content += str.getOilName()+"  "+str.getOrderLiters()+"  "+str.getAmt()+"  "+str.getOrderNo()+"  "+str.getDiscountAmt()+ " <BR>";
                     if(str.getAmt()!=null){
                         sumAmt=sumAmt.add(str.getAmt());
                     }
@@ -404,8 +476,8 @@ public class StationClassStructureController extends BaseController
                     if(str.getOrderNo()!=null){
                         num= num+Integer.parseInt(str.getOrderNo());
                     }
-                    if(str.getDiscountCouponAmt()!=null){
-                        coupon=coupon.add(str.getDiscountCouponAmt());
+                    if(str.getDiscountAmt()!=null){
+                        coupon=coupon.add(str.getDiscountAmt());
                     }
                     if(str.getPrintNum()!=null){
                         pageNum += str.getPrintNum();
@@ -414,9 +486,9 @@ public class StationClassStructureController extends BaseController
                 content += "--------------------------------<BR>";
                 content += "合计  "+liters+"  "+sumAmt+"  "+num+"  "+coupon+"<BR>";
                 content += "小票张数： "+pageNum+" 张<BR>";
-                content += "班结金额： "+sumAmt+" 元<BR>";
+                content += "班结金额： "+ysAmt+" 元<BR>";
                 content += "优惠总额： "+coupon+" 元<BR>";
-                content += "实际支付： "+ysAmt +" 元<BR>";
+                content += "实际支付： "+sumAmt+" 元<BR>";
                 content += "班结人： "+list.get(0).getClassStructureMan()+"<BR>";
             }else{
                 content += "开始时间： <BR>";

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listOilStructure" parameterType="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(order_liters),2) as order_liters,COUNT(order_no) as order_no,a.class_start_date,a.class_structure_date,a.class_structure_man
+       	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>