修改

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

@@ -67,7 +67,8 @@ public class ElectronicMembershipCardController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(stationId !=null && unionId !=null){
+        logger.info("获取用户电子会员卡信息参数：油站ID："+ stationId+"用户unionId："+unionId);
+        if(stationId !=null && unionId !=null && unionId !=""){
             CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
             customerElectronicCard.setStationId(stationId);
             customerElectronicCard.setUnionId(unionId);

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

@@ -62,7 +62,7 @@ public class PayController {
      */
     @RequestMapping(value = "/dzkPaySet", method = RequestMethod.GET)
     @ResponseBody
-    public  String dzkPaySet(@RequestParam String ordNo, String payType) throws ParseException {
+    public  String dzkPaySet(@RequestParam String ordNo) throws ParseException {
         Gson gson =new Gson();
         ResultData resultData =null;
         if(ordNo !=null){
@@ -139,7 +139,7 @@ public class PayController {
                     c.setStationId(customerCardUseRecord.getStationId());
                     c.setCardOilsType(cardOilsType);
                     electronicMembershipCardService.updateElectronicCardInfoByUnionId(c);
-                    payOrder.setPayType(payType);   //支付方式                                                 //支付类型
+                    payOrder.setPayType("dzk");   //支付方式                                                 //支付类型
                     payOrder.setStatus("1");
                     payOrder.setPayDate(new Date());    //支付时间
                     payOrderService.getUpdatePayOrder(payOrder);
@@ -704,6 +704,7 @@ public class PayController {
                     PayOrder payOrder = new PayOrder();
                     payOrder.setOrderNo(ordNo);
                     payOrder.setStatus("1");
+                    payOrder.setPayType("wx");
                     payOrder.setPayDate(new Date());    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
                     //修改订单状态

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

@@ -200,6 +200,12 @@ public class PayOrderController {
                     break;
             }
             payOrder.setOilType(orderType);
+            String stationCardEnabledFlag = electronicMembershipCardService.getStationCardEnabledFlag(payOrderRequest.getStationId());
+            //查询油站是否开启电子会员卡功能
+            if(stationCardEnabledFlag.equals("1")){
+                String balance = this.selectCardBalance(payOrderRequest.getStationId(), oilName, appUserInfoList.get(0).getUnionId());
+                resultMap.put("balance", balance);
+            }
             StationInfo stationInfo = new StationInfo();
             stationInfo.setStationId(payOrderRequest.getStationId());
             StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
@@ -208,7 +214,7 @@ public class PayOrderController {
                 resultMap.put("stationPic", stationInfos.getStationPic());
                 resultMap.put("stationName", stationInfos.getStationName());
             }
-            payOrder.setPayType("wx");                          //支付类型
+            //payOrder.setPayType("wx");                          //支付类型
             switch (orderType){
                 case "1":       //油品
                     payOrderMapper.insertSelective(payOrder);
@@ -240,6 +246,41 @@ public class PayOrderController {
         return gson.toJson(resultData);
     }
 
+    //查询用户电子会员卡余额
+    public String  selectCardBalance(Integer stationId, String oilName, String unionId) {
+        String cardOilsType ="";
+        switch (oilName){                               //根据油品名称存储电子卡油品类型 1.柴油 2 汽油
+            case "92#":
+                cardOilsType ="1";
+                break;
+            case "95#":
+                cardOilsType ="1";
+                break;
+            case "97#":
+                cardOilsType ="1";
+                break;
+            case "0#":
+                cardOilsType ="2";
+                break;
+            case "-10#":
+                cardOilsType ="2";
+                break;
+            case "-20#":
+                cardOilsType ="2";
+                break;
+        }
+        CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
+        customerElectronicCard.setCardOilsType(cardOilsType);
+        customerElectronicCard.setStationId(stationId);
+        customerElectronicCard.setUnionId(unionId);
+        CustomerElectronicCard electronicCardInfo = electronicMembershipCardService.getElectronicCardInfoByUnionId(customerElectronicCard);
+        BigDecimal balance = null;
+        if(electronicCardInfo !=null){
+            balance = electronicCardInfo.getAmt();
+        }
+        return balance.toString();
+    }
+
     /***
      * 计算订单金额
      * @return

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

@@ -688,11 +688,8 @@
             <if test="stationId !='' and stationId != null" >
                 station_id = #{stationId}
             </if>
-<!--            <if test="minaOpenid !='' and minaOpenid != null" >-->
-<!--                AND mina_openid = #{minaOpenid}-->
-<!--            </if>-->
-            <if test="unionId !='' and unionId != null" >
-                AND union_id = #{unionId}
+            <if test="minaOpenid !='' and minaOpenid != null" >
+                AND mina_openid = #{minaOpenid}
             </if>
             <if test="cardOilsType !='' and cardOilsType != null" >
                 AND card_oils_type = #{cardOilsType}