修改

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

@@ -62,7 +62,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         payOrder.setMemberAmt(payOrderRequest.getMemberAmt());    //会员支付金额
         payOrder.setPrintCount(payOrderRequest.getPrintCount());    //小票数量
         payOrder.setScore(payOrderRequest.getScore());      //积分
-        payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));   //金额
+        payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));   //实收金额
         payOrder.setStationId(payOrderRequest.getStationId());  //油站id
         payOrder.setStatus("0");         //创建订单 未支付状态 0
         payOrder.setPayType("sxf");      //支付类型
@@ -80,8 +80,8 @@ public class PayOrderServiceImpl implements PayOrderService {
         params.put("stationId", payOrderRequest.getStationId());
         String oilPersonnel = "";
         //使用list原因：一个枪号对应多个加油员场景
-        //List<Map> mapResultList = payOrderMapper.selectPersonelName(params);
-        List<Map> mapResultList = payOrderMapper.selectOilGunNoAndOilPrice(params);
+        List<Map> mapResultList = payOrderMapper.selectPersonelName(params);
+        //List<Map> mapResultList = payOrderMapper.selectOilGunNoAndOilPrice(params);
         if(mapResultList != null && mapResultList.size() > 0){
             for (Map per : mapResultList){
                 if(per.containsKey("personelName") && per.get("personelName").toString() !=null && per.get("personelName").toString() !=""){
@@ -98,35 +98,35 @@ public class PayOrderServiceImpl implements PayOrderService {
 
         Double receivableAmt = payOrderRequest.getReceivableAmt();  //获取应收金额
         payOrder.setReceivableAmt(receivableAmt);
-//        Double oilPrice = payOrderRequest.getOilPrice();            //获取油价
-//        payOrder.setOilPirce(oilPrice.toString());
-//        //计算加油升数
-//        if(receivableAmt != null && oilPrice != null){
-//            payOrder.setOrderLiters(recKonOrderLiters(receivableAmt.toString(), oilPrice.toString(), 2));
-//        }
+        Double oilPrice = payOrderRequest.getOilPrice();            //获取油价
+        payOrder.setOilPirce(String.valueOf(oilPrice));
+        //计算加油升数
+        if(receivableAmt != null && oilPrice != null){
+            payOrder.setOrderLiters(recKonOrderLiters(String.valueOf(receivableAmt), String.valueOf(oilPrice), 2));
+        }
 
         //根据油品名称和油站id获取当前油品调价信息
-        params.put("oilName", payOrderRequest.getOilName());
-        List<Map> oilPriceAdjustList = payOrderMapper.selectOilPriceAdjust(params);
-        String amt = payOrderRequest.getAmt();  //订单金额
-        if(oilPriceAdjustList != null && oilPriceAdjustList.size() > 0){  //若存在油价价格调整时
-            for (Map m : oilPriceAdjustList){
-                // 如果生效时间小于当前时间则使用生效时间 取离当前时间最近的调整价格（查询结果按生效时间降序排序故只做此判断即可）
-                if(compareEffectTime(m.get("takeEffectDate").toString())){
-                    if(m.containsKey("oilAdjustPrice") && m.get("oilAdjustPrice").toString() !=null && !m.get("oilAdjustPrice").toString().equals("")){
-                        payOrder.setOrderLiters(recKonOrderLiters(amt, m.get("oilAdjustPrice").toString(), 2));       //计算加油升数且存入
-                        payOrder.setOilPirce(m.get("oilAdjustPrice").toString());
-                    }
-                    break;
-                }
-            }
-        }else {     //若没有油价调整时则使用原始油价计算加油升数
-            if(mapResultList.get(0).containsKey("oilPrice") && mapResultList.get(0).get("oilPrice").toString() !=null && !mapResultList.get(0).get("oilPrice").toString().equals("")){
-                String oilPrice = mapResultList.get(0).get("oilPrice").toString();    //原始价格
-                payOrder.setOilPirce(oilPrice);
-                payOrder.setOrderLiters(recKonOrderLiters(amt, oilPrice, 2));     //计算油价升数存放
-            }
-        }
+//        params.put("oilName", payOrderRequest.getOilName());
+//        List<Map> oilPriceAdjustList = payOrderMapper.selectOilPriceAdjust(params);
+//        String amt = payOrderRequest.getAmt();  //订单金额
+//        if(oilPriceAdjustList != null && oilPriceAdjustList.size() > 0){  //若存在油价价格调整时
+//            for (Map m : oilPriceAdjustList){
+//                // 如果生效时间小于当前时间则使用生效时间 取离当前时间最近的调整价格（查询结果按生效时间降序排序故只做此判断即可）
+//                if(compareEffectTime(m.get("takeEffectDate").toString())){
+//                    if(m.containsKey("oilAdjustPrice") && m.get("oilAdjustPrice").toString() !=null && !m.get("oilAdjustPrice").toString().equals("")){
+//                        payOrder.setOrderLiters(recKonOrderLiters(amt, m.get("oilAdjustPrice").toString(), 2));       //计算加油升数且存入
+//                        payOrder.setOilPirce(m.get("oilAdjustPrice").toString());
+//                    }
+//                    break;
+//                }
+//            }
+//        }else {     //若没有油价调整时则使用原始油价计算加油升数
+//            if(mapResultList.get(0).containsKey("oilPrice") && mapResultList.get(0).get("oilPrice").toString() !=null && !mapResultList.get(0).get("oilPrice").toString().equals("")){
+//                String oilPrice = mapResultList.get(0).get("oilPrice").toString();    //原始价格
+//                payOrder.setOilPirce(oilPrice);
+//                payOrder.setOrderLiters(recKonOrderLiters(amt, oilPrice, 2));     //计算油价升数存放
+//            }
+//        }
 
         String oilName = payOrderRequest.getOilName();
         payOrder.setOilName(oilName);      //油品名称

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

@@ -459,70 +459,70 @@
       </if>
 
       <if test="receivableAmt != null">
-        #{receivable_amt,jdbcType=DOUBLE},
+        #{receivableAmt,jdbcType=DOUBLE},
       </if>
       <if test="receivedAmt != null">
-        #{received_amt,jdbcType=DOUBLE},
+        #{receivedAmt,jdbcType=DOUBLE},
       </if>
       <if test="discountAmt != null">
-        #{discount_amt,jdbcType=DOUBLE},
+        #{discountAmt,jdbcType=DOUBLE},
       </if>
       <if test="discountCouponAmt != null">
-        #{discount_coupon_amt,jdbcType=DOUBLE},
+        #{discountCouponAmt,jdbcType=DOUBLE},
       </if>
       <if test="discountCoupon != null">
-        #{discount_coupon,jdbcType=VARCHAR},
+        #{discountCoupon,jdbcType=VARCHAR},
       </if>
 
 
       <if test="wxAmt != null">
-        #{wx_amt,jdbcType=DOUBLE},
+        #{wxAmt,jdbcType=DOUBLE},
       </if>
       <if test="zfbAmt != null">
-        #{zfb_amt,jdbcType=DOUBLE},
+        #{zfbAmt,jdbcType=DOUBLE},
       </if>
       <if test="posAmt != null">
-        #{pos_amt,jdbcType=DOUBLE},
+        #{posAmt,jdbcType=DOUBLE},
       </if>
       <if test="xjAmt != null">
-        #{xj_amt,jdbcType=DOUBLE},
+        #{xjAmt,jdbcType=DOUBLE},
       </if>
       <if test="didiAppAmt != null">
-        #{didi_app_amt,jdbcType=DOUBLE},
+        #{didiAppAmt,jdbcType=DOUBLE},
       </if>
       <if test="tyAppAmt != null">
-        #{ty_app_amt,jdbcType=DOUBLE},
+        #{tyAppAmt,jdbcType=DOUBLE},
       </if>
 
 
       <if test="otherAmt != null">
-        #{other_amt,jdbcType=DOUBLE},
+        #{otherAmt,jdbcType=DOUBLE},
       </if>
       <if test="dzkAmt != null">
-        #{dzk_amt,jdbcType=DOUBLE},
+        #{dzkAmt,jdbcType=DOUBLE},
       </if>
       <if test="score != null">
         #{score,jdbcType=INTEGER},
       </if>
       <if test="memberNo != null">
-        #{member_no,jdbcType=VARCHAR},
+        #{memberNo,jdbcType=VARCHAR},
       </if>
       <if test="memberAmt != null">
-        #{member_amt,jdbcType=DOUBLE},
+        #{memberAmt,jdbcType=DOUBLE},
       </if>
 
 
       <if test="printCount != null">
-        #{print_count,jdbcType=INTEGER},
+        #{printCount,jdbcType=INTEGER},
       </if>
       <if test="carNo != null">
-        #{car_no,jdbcType=VARCHAR},
+        #{carNo,jdbcType=VARCHAR},
       </if>
       <if test="customerPhone != null">
-        #{customer_phone,jdbcType=VARCHAR},
+        #{customerPhone,jdbcType=VARCHAR},
       </if>
       <if test="customerGrade != null">
-        #{customer_grade,jdbcType=VARCHAR},
+        #{customerGrade,jdbcType=VARCHAR},
       </if>
       <if test="oilType != null">
         #{oilType,jdbcType=VARCHAR}