添加oil_type

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

@@ -445,6 +445,7 @@ public class PayController {
                     payOrder.setOrderId(ordId);
                     payOrder.setStatus("2");
                     payOrder.setPayDate(new Date());    //支付时间
+                    payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
                     //根据修改状态
                     payOrderService.getUpdatePayOrder(payOrder);
                     req.put("code","success");

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

@@ -41,8 +41,41 @@ public class PayOrderServiceImpl implements PayOrderService {
         //System.out.println("随机生成6位数result ："+result);
         String ordNo=System.nanoTime()+result;
         payOrder.setOrderNo(ordNo);
-        payOrder.setOilName(payOrderRequest.getOilName());      //油品名称
-        payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));              //金额
+        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;
+        }
+        payOrder.setReceivableAmt(payOrderRequest.getReceivableAmt());  //应收金额
+        payOrder.setDiscountAmt(payOrderRequest.getDiscountAmt());  //优惠金额
+        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.setOilType(payOrderRequest.getOilType());      //油品类型
+        payOrder.setAmt(Double.valueOf(payOrderRequest.getAmt()));   //金额
         payOrder.setStationId(payOrderRequest.getStationId());  //油站id
         payOrder.setStatus("0");         //创建订单 未支付状态 0
         payOrder.setPayType("sxf");      //支付类型