修改

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

@@ -405,6 +405,7 @@ public class ElectronicMembershipCardController {
                     payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(dzkAmt));
                     payOrder.setAmt(Double.valueOf(dzkAmt));
+                    payOrder.setWxAmt(Double.valueOf("0"));
                     payOrder.setDzkAmt(Double.valueOf(dzkAmt));
                     //payOrder.setTransactionId(ordNo);
                     //BigDecimal discountAmt = new BigDecimal(receivableAmt).subtract(new BigDecimal(dzkAmt));

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

@@ -578,6 +578,7 @@ public class PayController {
                         payOrder.setPayType("zfb");
                     }
                     payOrder.setWxAmt(Double.valueOf(amt));
+                    payOrder.setDzkAmt(Double.valueOf("0"));
                     payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
                     //修改订单状态

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

@@ -129,11 +129,16 @@ public class PayOrderController {
 
                     //根据油站和油枪获取加油员
                     if (payOrderRequest.getPersonnelId() != null) {
+                        //表示为一人一码：一个加油员一个码
                         Map<String, Object> params = new HashMap<>();
                         params.put("personnelId", payOrderRequest.getPersonnelId());
                         List<Map<String, Object>> list = stationOilGunService.selectOilGunByPersonalId(params);
                         if (list != null && list.size() > 0) {
-                            payOrder.setOilPersonnel(list.get(0).get("personnelName").toString());
+                            if(list.get(0).containsKey("personnelName") && list.get(0).get("personnelName") !=null && list.get(0).get("personnelName").toString() !=""){
+                                payOrder.setOilPersonnel(list.get(0).get("personnelName").toString());
+                            }else {
+                                payOrder.setOilPersonnel("--");
+                            }
                         } else {
                             payOrder.setOilPersonnel("--");
                         }

YijiaRestful/src/main/java/com/platform/yijia/param/response/StationInfoResponse.java

@@ -4,6 +4,7 @@ public class StationInfoResponse {
     private Integer stationId;
     private String stationName;
     private String stationAddress;
+    private String city;
     private Integer oilGunNum;
     private String contacts;
     private String phone;
@@ -15,6 +16,14 @@ public class StationInfoResponse {
     private Double distance;//距离
     private String mno;//商户号
 
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
     public String getMno() {
         return mno;
     }

YijiaRestful/src/main/java/com/platform/yijia/pojo/StationInfo.java

@@ -146,6 +146,15 @@ public class StationInfo {
     private String isLngFlag;               //该油站是否为LNG第三方平台商：0，否；1，是；
     private String isLngFlagGroup;          //该集团是否为LNG第三方平台商：0，否；1，是；
     private Double balance;                 //余额
+    private String city;                    //油站所在市
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
 
     public Double getBalance() {
         return balance;

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

@@ -195,6 +195,7 @@ public class StationServiceImpl implements StationService {
                     Double format = Double.parseDouble(String.format("%.1f", distance));
                     //计算距离 展示距离小于5公里以内的站
                     //if(format<=5){
+                        stationInfoResponse.setCity(stationInfo.getCity());
                         stationInfoResponse.setStationId(stationInfo.getStationId());
                         stationInfoResponse.setStationName(stationInfo.getStationName());
                         stationInfoResponse.setStationAddress(stationInfo.getStationAddress());

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

@@ -5,6 +5,7 @@
     <id     column="dept_id"              jdbcType="INTEGER" property="stationId" />
     <id     column="parent_id"            jdbcType="INTEGER" property="groupId" />
     <result column="dept_name"            jdbcType="VARCHAR" property="stationName" />
+    <result column="city"                 jdbcType="VARCHAR" property="city" />
     <result column="dept_address"         jdbcType="VARCHAR" property="stationAddress" />
     <result column="oil_gun_num"          jdbcType="INTEGER" property="oilGunNum" />
     <result column="leader"               jdbcType="VARCHAR" property="contacts" />
@@ -109,6 +110,7 @@
           T1.dept_id,
           T1.parent_id,
           T1.dept_name,
+          T1.city,
           T1.dept_address,
           T1.station_longitude,
           T1.station_latitude,
@@ -128,6 +130,7 @@
         T1.parent_id,
         T1.dept_name,
         T1.dept_address,
+        T1.city,
         T1.oil_gun_num,
         T1.leader,
         T1.station_longitude,
@@ -237,7 +240,7 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    dept_id, parent_id, dept_name, dept_address, oil_gun_num, leader, phone,
+    dept_id, parent_id, dept_name, dept_address, city, oil_gun_num, leader, phone,
     station_longitude, station_latitude, mno
   </sql>
   <sql id="Blob_Column_List">