修改班结信息

Yijia-SaaS/yijia-customer/src/main/java/com/yijia/customer/domain/CustomerGradeSetting.java

@@ -11,7 +11,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 客户优惠等级设置对象 customer_grade_setting
  * 
  * @author yijia
- * @date 2021-01-23
+ * @date 2021-01-26
  */
 public class CustomerGradeSetting extends BaseEntity
 {
@@ -93,6 +93,14 @@ public class CustomerGradeSetting extends BaseEntity
     @Excel(name = "油品名称")
     private String oilName;
 
+    /** 会员条件开始值 */
+    @Excel(name = "会员条件开始值")
+    private Long memberConditStart;
+
+    /** 会员条件结束值 */
+    @Excel(name = "会员条件结束值")
+    private Long memberConditEnd;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -264,6 +272,24 @@ public class CustomerGradeSetting extends BaseEntity
     {
         return oilName;
     }
+    public void setMemberConditStart(Long memberConditStart) 
+    {
+        this.memberConditStart = memberConditStart;
+    }
+
+    public Long getMemberConditStart() 
+    {
+        return memberConditStart;
+    }
+    public void setMemberConditEnd(Long memberConditEnd) 
+    {
+        this.memberConditEnd = memberConditEnd;
+    }
+
+    public Long getMemberConditEnd() 
+    {
+        return memberConditEnd;
+    }
 
     @Override
     public String toString() {
@@ -287,6 +313,8 @@ public class CustomerGradeSetting extends BaseEntity
             .append("stationId", getStationId())
             .append("stationName", getStationName())
             .append("oilName", getOilName())
+            .append("memberConditStart", getMemberConditStart())
+            .append("memberConditEnd", getMemberConditEnd())
             .toString();
     }
 }

Yijia-SaaS/yijia-customer/src/main/resources/mapper/customer/CustomerGradeSettingMapper.xml

@@ -24,10 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stationId"    column="station_id"    />
         <result property="stationName"    column="station_name"    />
         <result property="oilName"    column="oil_name"    />
+        <result property="memberConditStart"    column="member_condit_start"    />
+        <result property="memberConditEnd"    column="member_condit_end"    />
     </resultMap>
 
     <sql id="selectCustomerGradeSettingVo">
-        select id, grade, discount_way, gasoil_discount_litre, dieseloil_discount_litre, grade_type, gasoil_consume, gasoil_growth_value, dieseloil_consume, dieseloil_growth_value, member_recharge, member_growth_value, growth_value, date, deduction_growth_value, member_condit, station_id, station_name, oil_name from customer_grade_setting
+        select id, grade, discount_way, gasoil_discount_litre, dieseloil_discount_litre, grade_type, gasoil_consume, gasoil_growth_value, dieseloil_consume, dieseloil_growth_value, member_recharge, member_growth_value, growth_value, date, deduction_growth_value, member_condit, station_id, station_name, oil_name, member_condit_start, member_condit_end from customer_grade_setting
     </sql>
 
     <select id="selectCustomerGradeSettingList" parameterType="CustomerGradeSetting" resultMap="CustomerGradeSettingResult">
@@ -51,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null "> and station_id = #{stationId}</if>
             <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
             <if test="oilName != null  and oilName != ''"> and oil_name like concat('%', #{oilName}, '%')</if>
+            <if test="memberConditStart != null "> and member_condit_start = #{memberConditStart}</if>
+            <if test="memberConditEnd != null "> and member_condit_end = #{memberConditEnd}</if>
         </where>
     </select>
     
@@ -80,6 +84,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id,</if>
             <if test="stationName != null">station_name,</if>
             <if test="oilName != null">oil_name,</if>
+            <if test="memberConditStart != null">member_condit_start,</if>
+            <if test="memberConditEnd != null">member_condit_end,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="grade != null">#{grade},</if>
@@ -100,6 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">#{stationId},</if>
             <if test="stationName != null">#{stationName},</if>
             <if test="oilName != null">#{oilName},</if>
+            <if test="memberConditStart != null">#{memberConditStart},</if>
+            <if test="memberConditEnd != null">#{memberConditEnd},</if>
          </trim>
     </insert>
 
@@ -124,6 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stationId != null">station_id = #{stationId},</if>
             <if test="stationName != null">station_name = #{stationName},</if>
             <if test="oilName != null">oil_name = #{oilName},</if>
+            <if test="memberConditStart != null">member_condit_start = #{memberConditStart},</if>
+            <if test="memberConditEnd != null">member_condit_end = #{memberConditEnd},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -189,6 +189,12 @@ public class StationClassStructureController extends BaseController
                 stationclass.setOrderNo(payOrder.getOrderNo());
                 stationclass.setOilGun(payOrder.getOilGun());
                 stationclass.setOilName(payOrder.getOilName());
+                if(payOrder.getOilPirce()!=null){
+                    stationclass.setOilPirce(payOrder.getOilPirce());
+                }
+                if(payOrder.getOilType()!=null){
+                    stationclass.setOilType(payOrder.getOilType());
+                }
                 stationclass.setConsumerId(payOrder.getConsumerId());
                 stationclass.setConsumer(payOrder.getConsumer());
                 stationclass.setAmt(payOrder.getAmt());
@@ -282,6 +288,7 @@ public class StationClassStructureController extends BaseController
                 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);
                 for(PayOrder payOrder:list){
@@ -295,6 +302,12 @@ public class StationClassStructureController extends BaseController
                     stationclass.setOrderNo(payOrder.getOrderNo());
                     stationclass.setOilGun(payOrder.getOilGun());
                     stationclass.setOilName(payOrder.getOilName());
+                    if(payOrder.getOilPirce()!=null){
+                        stationclass.setOilPirce(payOrder.getOilPirce());
+                    }
+                    if(payOrder.getOilType()!=null){
+                        stationclass.setOilType(payOrder.getOilType());
+                    }
                     stationclass.setConsumerId(payOrder.getConsumerId());
                     stationclass.setConsumer(payOrder.getConsumer());
                     stationclass.setAmt(payOrder.getAmt());
@@ -406,8 +419,15 @@ public class StationClassStructureController extends BaseController
                 stationClassesSummary.setSaleLiters(stationclass.getOrderLiters());
             }
             if(stationclass.getAmt()!=null){
-                stationClassesSummary.setSaleAmt(stationclass.getAmt());
+                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{

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/domain/StationClassesSummary.java

@@ -12,7 +12,7 @@ import com.yijia.common.core.domain.BaseEntity;
  * 班结汇总对象 station_classes_summary
  * 
  * @author yijia
- * @date 2021-01-12
+ * @date 2021-01-27
  */
 public class StationClassesSummary extends BaseEntity
 {
@@ -24,18 +24,15 @@ public class StationClassesSummary extends BaseEntity
     /** 班次号 */
     @Excel(name = "班次号")
     private String classesNo;
-    /** 班次号 */
-    @Excel(name = "模糊查询班次号")
-    private String likeClassesNo;
 
     /** 班次开始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "班次开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "班次开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date startDate;
 
     /** 班次结束时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "班次结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "班次结束时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date endDate;
 
     /** 油站id */
@@ -58,27 +55,34 @@ public class StationClassesSummary extends BaseEntity
     @Excel(name = "销量L")
     private BigDecimal saleLiters;
 
-    /** 销售额元 */
-    @Excel(name = "销售额元")
+    /** 应收金额 */
+    @Excel(name = "应收金额")
     private BigDecimal saleAmt;
 
-    /** 微信销售金额 */
-    @Excel(name = "微信销售金额")
+    /** 实际支付金额 */
+    @Excel(name = "实际支付金额")
+    private BigDecimal amt;
+
+    /** 优惠金额 */
+    @Excel(name = "优惠金额")
+    private BigDecimal discountAmt;
+
+    /** 微信实际支付金额 */
+    @Excel(name = "微信实际支付金额")
     private BigDecimal wxAmt;
 
-    /** 支付宝销售金额 */
-    @Excel(name = "支付宝销售金额")
+    /** 支付宝实际支付金额 */
+    @Excel(name = "支付宝实际支付金额")
     private BigDecimal zfbAmt;
 
-    /** 电子卡销售金额 */
-    @Excel(name = "电子卡销售金额")
+    /** 电子卡实际支付金额 */
+    @Excel(name = "电子卡实际支付金额")
     private BigDecimal dzkAmt;
 
     /** 班结人 */
     @Excel(name = "班结人")
     private String classesMan;
 
-
     public void setId(Long id) 
     {
         this.id = id;
@@ -169,6 +173,24 @@ public class StationClassesSummary extends BaseEntity
     {
         return saleAmt;
     }
+    public void setAmt(BigDecimal amt) 
+    {
+        this.amt = amt;
+    }
+
+    public BigDecimal getAmt() 
+    {
+        return amt;
+    }
+    public void setDiscountAmt(BigDecimal discountAmt) 
+    {
+        this.discountAmt = discountAmt;
+    }
+
+    public BigDecimal getDiscountAmt() 
+    {
+        return discountAmt;
+    }
     public void setWxAmt(BigDecimal wxAmt) 
     {
         this.wxAmt = wxAmt;
@@ -219,6 +241,8 @@ public class StationClassesSummary extends BaseEntity
             .append("printNum", getPrintNum())
             .append("saleLiters", getSaleLiters())
             .append("saleAmt", getSaleAmt())
+            .append("amt", getAmt())
+            .append("discountAmt", getDiscountAmt())
             .append("wxAmt", getWxAmt())
             .append("zfbAmt", getZfbAmt())
             .append("dzkAmt", getDzkAmt())

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

@@ -149,8 +149,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <!--根据班次号汇总班结数据-->
     <select id="selectSummyClassStructure" parameterType="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,sum(print_num) as print_num
+        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>

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

@@ -15,6 +15,8 @@ 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"    />
@@ -22,7 +24,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, 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, amt, discount_amt, wx_amt, zfb_amt, dzk_amt, classes_man from station_classes_summary
     </sql>
 
     <select id="selectStationClassesSummaryList" parameterType="StationClassesSummary" resultMap="StationClassesSummaryResult">
@@ -37,18 +39,13 @@ 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="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">
@@ -68,6 +65,8 @@ 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>
@@ -83,6 +82,8 @@ 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>
@@ -102,6 +103,8 @@ 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>