xiugai

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

@@ -1293,6 +1293,139 @@ public class ElectronicMembershipCardController {
         return req;
     }
 
+
+    /***
+     * 公众号扫呗支付回调
+     * @param params
+     * @return
+     */
+    @RequestMapping(value = "/getYunPayGzhCallback", consumes = "text/xml", method = RequestMethod.POST)
+    @ResponseBody
+    @Transactional
+    public net.sf.json.JSONObject getYunPayGzhCallback(@RequestBody String params){
+        net.sf.json.JSONObject result = new net.sf.json.JSONObject();       //返回给扫呗状态码
+        logger.info("=============================云闪付（扫呗）公众号电子卡充值 回调接口 ** 开始 ** ===============================================");
+        YunPayCallBack yunPayCallBack = JSON.parseObject(params, YunPayCallBack.class);
+        logger.info("云闪付扫呗 公众号支付 回调接口返回参数：" + params);System.out.println("扫呗调用回调接口返回参数：" + params);
+        if(yunPayCallBack.getResult_code() !=null && yunPayCallBack.getResult_code().equals("01")){
+            logger.info("  -------------------------云闪付回调成功--------------------------  ");
+            //返给云闪付状态码
+            result.put("return_code", "01");
+            result.put("return_msg", "success");
+            //业务逻辑
+            String ordNo = yunPayCallBack.getTerminal_trace();
+            String amt = yunPayCallBack.getReceipt_fee();
+            CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();
+            customerCardUseRecord.setOrderNo(ordNo);
+            CustomerCardUseRecord customerCardUseRecordInfo = electronicMembershipCardService.getCardRecordByOrderNo(customerCardUseRecord);
+            // 0表示未支付  1表示已支付
+            if(customerCardUseRecordInfo !=null && customerCardUseRecordInfo.getStatus().equals("0")){
+                logger.info("客户unionId：" +customerCardUseRecordInfo.getUnionId());
+                logger.info("充值单号：" + ordNo);
+                CustomerElectronicCard customerElectronicCard = new CustomerElectronicCard();
+                customerElectronicCard.setUnionId(customerCardUseRecordInfo.getUnionId());
+                //获取油站是否开启共享
+                StationInfo stationInfo = new StationInfo();
+                AppUserInfo appUserInfo = new AppUserInfo();
+                stationInfo.setStationId(customerCardUseRecordInfo.getStationId());
+                StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+                customerElectronicCard.setStationId(customerCardUseRecordInfo.getStationId());
+                appUserInfo.setStationId(stationInfos.getGroupId());
+                appUserInfo.setUnionId(customerCardUseRecordInfo.getUnionId());
+                if(stationInfos.getCardRuleFlagGroup().equals("1")){
+                    customerElectronicCard.setStationId(stationInfos.getGroupId());
+                }
+                //是否有赠送金额
+                BigDecimal presentAmt =new BigDecimal(0);
+                if(customerCardUseRecordInfo.getPresentAmt() !=null){
+                    presentAmt = customerCardUseRecordInfo.getPresentAmt();  //客户充值赠送金额
+                    logger.info("客户充值赠送金额：" +presentAmt.toString());
+                }
+                customerElectronicCard.setRecentlyTime(new Date());
+                customerElectronicCard.setCardOilsType(customerCardUseRecordInfo.getCardOilsType());
+                logger.info("查询客户电子卡信息所传递参数： 油站ID："+customerElectronicCard.getStationId()+"; 客户unionId：" + customerElectronicCard.getUnionId()+"; 卡的类型："+ customerElectronicCard.getCardOilsType());
+                //获取客户充值的得电子卡信息
+                CustomerElectronicCard electronicCardInfo = electronicMembershipCardService.getElectronicCardInfoByUnionId(customerElectronicCard);
+                if(electronicCardInfo !=null){
+                    logger.info("客户当前原有金额：" + electronicCardInfo.getAmt().toString());
+                    customerElectronicCard.setAmt(electronicCardInfo.getAmt().add(new BigDecimal(amt)).add(presentAmt));
+                    //更新客户要充值的电子会员卡的信息
+                    if(customerElectronicCard.getStationId()!=null && customerElectronicCard.getUnionId() !=null){
+                        logger.info("客户当前充值后应有金额：" + customerElectronicCard.getAmt().toString());
+                        electronicMembershipCardService.updateElectronicCardInfoByUnionId(customerElectronicCard);
+                    }
+                    customerCardUseRecord.setMobilePhone(electronicCardInfo.getMobilePhone());
+                    customerCardUseRecord.setStatus("1");
+                    customerCardUseRecord.setBalance(customerElectronicCard.getAmt());
+                    customerCardUseRecord.setOrderNo(ordNo);
+                    if(yunPayCallBack.getPay_type().equals("010")){
+                        customerCardUseRecord.setPayType("1");
+                    }else if(yunPayCallBack.getPay_type().equals("020")){
+                        customerCardUseRecord.setPayType("2");
+                    }
+                    //更新充值记录的状态和余额
+                    electronicMembershipCardService.updateCardRecordStatusByOrderNo(customerCardUseRecord);
+                    logger.info("===========客户电子会员卡充值成功已到账====");
+                    logger.info("===========开始微信公众号电子卡推送消息功能：");
+                    String stationName = customerCardUseRecordInfo.getStationName();
+                    //String blogOpenid = customerCardUseRecordInfo.getBlogOpenid();
+                    Integer stationId = customerCardUseRecordInfo.getStationId();      //油站ID
+                    //String customerName = customerCardUseRecordInfo.getCustomerName(); //客户名称
+                    BigDecimal balance = customerElectronicCard.getAmt();   //当前余额
+                    String customerNo = electronicCardInfo.getCustomerNo();     //电子卡号
+                    //获取要推送充值成功模板的ID
+                    GzhNewsTemplate gzhNewsTemplate = new GzhNewsTemplate();
+                    gzhNewsTemplate.setTemplateType("3");   //3 代表电子会员卡充值成功模板类型
+                    gzhNewsTemplate.setStationId(stationId);
+                    GzhNewsTemplate gzhNewsTemplateInfo = gzhNewsTemplateService.getGzhNewsTemplate(gzhNewsTemplate);
+                    if(gzhNewsTemplateInfo !=null && gzhNewsTemplateInfo.getTemplateId() !=null){
+                        logger.info("推送消息的油站ID："+ gzhNewsTemplateInfo.getStationId().toString());
+                        logger.info("当前要推送消息所用使用的模板ID："+ gzhNewsTemplateInfo.getTemplateId());
+                        AppUserInfo appUserInfos = appUserInfoService.getAppUserInfo(appUserInfo);
+                        if(appUserInfos !=null){
+                            List<WxMpTemplateData> wxMpTemplate = new ArrayList<>();
+                            Oil oil = new Oil();
+                            oil.setOilsType(customerCardUseRecordInfo.getCardOilsType());
+                            if(customerCardUseRecordInfo.getCardOilsType().equals("1") || customerCardUseRecordInfo.getCardOilsType().equals("2")){
+                                oil.setDictType("oil");
+                            }else {
+                                oil.setDictType("oil_name");
+                            }
+                            String cardName =sysDictDataService.selectOilType(oil).getOilName();
+                            wxMpTemplate.add(new WxMpTemplateData("first","尊敬的"+appUserInfos.getBlogNickName()+"，您好：\n" + "您在"+stationName+"的"+cardName+"电子卡充值成功信息如下"));
+                            wxMpTemplate.add(new WxMpTemplateData("keyword1", customerNo));
+                            wxMpTemplate.add(new WxMpTemplateData("keyword2", amt + " 元"));
+                            wxMpTemplate.add(new WxMpTemplateData("keyword3", presentAmt.toString()+ " 元"));
+                            wxMpTemplate.add(new WxMpTemplateData("keyword4", balance.toString()+ " 元"));
+                            wxMpTemplate.add(new WxMpTemplateData("keyword5", new SimpleDateFormat("yyyy年MM月dd日HH时mm分").format(new Date())));
+                            wxMpTemplate.add(new WxMpTemplateData("remark","感谢您在"+ stationName+"的本次充值！"));
+                            logger.info("要推送的消息内容：" +wxMpTemplate.toString());
+                            Map<String, String> m = stationService.getStationAppIdAndAppSecret(stationId);
+                            if(m !=null && m.containsKey("gzhAppId") && m.containsKey("gzhAppSecret")){
+                                String gzhAppId = m.get("gzhAppId");
+                                String gzhAppSecret = m.get("gzhAppSecret");
+                                if(StringUtils.isNotBlank(appUserInfos.getBlogOpenid())){
+                                    wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), appUserInfos.getBlogOpenid(), wxMpTemplate);
+                                    logger.info("结束微信公众号电子会员卡消息推送成功，推送人："+ appUserInfos.getBlogOpenid());
+                                    logger.info("===================================本次电子卡充值流程结束===========================================");
+                                }
+                            }
+                        }
+                    }
+                }
+            }else {
+                logger.info("此充值订单: "+ordNo+" 不存在或已完成支付！");
+            }
+        }else {
+            result.put("return_code", "02");
+            result.put("return_msg", "fail");
+        }
+        logger.info("返给云闪付结果信息：" + result);
+        logger.info("=======================================云闪付（扫呗） 公众号电子卡充值支付 回调接口 ** 结束 ** ===============================================");
+        return result;
+    }
+
+
     //获取用户电子会员卡（储蓄卡）充值消费记录
     @RequestMapping(value = "/getCardRecordList", method = RequestMethod.GET)
     @ResponseBody

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

@@ -342,6 +342,7 @@ public class PayController {
                                     && staPayChannelInfo.containsKey("yunKey") && staPayChannelInfo.containsKey("appId")) {
                                 //秘钥
                                 String yunKey = staPayChannelInfo.get("yunKey");                //23570b46a955484d92038f6a18d2b9d6
+                                logger.info("==============================云闪付 小程序支付油品 拉起支付 ** 开始 **============================================");
                                 DefaultSaobeiApiClient defaultSaobeiApiClient = new DefaultSaobeiApiClient(yunKey); //2ef428f4f76c414282e831baea9e4b0e
                                 SaobeiMiniPayRequest requst = new SaobeiMiniPayRequest();
                                 requst.setPay_ver("100");
@@ -396,6 +397,7 @@ public class PayController {
                                 //resultMap.put("respData", reqData);
                                 logger.info("云闪付返回给前端字段：" + JSON.toJSONString(reqData));
                                 resultData = ResultData.success(reqData);
+                                logger.info("==============================云闪付 小程序支付油品 拉起支付 ** 结束 **============================================");
                             }else {
                                 resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
                             }
@@ -999,10 +1001,10 @@ public class PayController {
     @ResponseBody
     @Transactional
     public net.sf.json.JSONObject getYunPayCallback(@RequestBody String params) throws ParseException {
-        logger.info("=============================云闪付（扫呗）** 开始 ** 调用回调接口===============================================");
+        logger.info("=============================云闪付（扫呗） 小程序支付完成 回调接口 ** 开始 ** ===============================================");
         net.sf.json.JSONObject result = new net.sf.json.JSONObject();       //返回
         YunPayCallBack yunPayCallBack = JSON.parseObject(params, YunPayCallBack.class);
-        logger.info("云闪付扫呗调用回调接口返回参数：" + params);
+        logger.info("云闪付扫呗 小程序支付 回调接口返回参数：" + params);
         //logger.info("云闪付扫呗调用回调接口状态码：" + yunPayCallBack.getResult_code());
         if(yunPayCallBack.getResult_code() !=null && yunPayCallBack.getResult_code().equals("01")){
             logger.info("-------------------------云闪付回调成功--------------------------                      ");
@@ -1153,7 +1155,7 @@ public class PayController {
             result.put("return_msg", "fail");
         }
         logger.info("返给云闪付结果信息：" + result);
-        logger.info("    =======================================云闪付（扫呗）** 结束 ** 调用回调接口===============================================");
+        logger.info("    =======================================云闪付（扫呗） 小程序支付完成 回调接口 ** 结束 ** ===============================================");
         return result;
     }
 

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

@@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.google.gson.Gson;
 import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.param.request.PayInfoRequest;
+import com.platform.yijia.param.request.RechargeBalance;
+import com.platform.yijia.pojo.CustomerCardUseRecord;
+import com.platform.yijia.pojo.Oil;
 import com.platform.yijia.pojo.PayOrder;
 import com.platform.yijia.service.*;
 import com.platform.yijia.utils.CodeMsg;
@@ -18,6 +21,7 @@ import com.saobei.open.sdk.model.response.trade.SaobeiJsPayResponse;
 import com.saobei.open.sdk.model.response.trade.SaobeiMiniPayResponse;
 import com.saobei.open.sdk.model.response.trade.preauth.SaobeiPreAuthMiniPayResponse;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -68,6 +72,11 @@ public class SaoBeiPayController {
     private GzhNewsTemplateService gzhNewsTemplateService;
     @Resource
     private  CustomerManagerService customerManagerService;
+    @Resource
+    private ElectronicMembershipCardService electronicMembershipCardService;
+    @Resource
+    private SysDictDataService sysDictDataService;
+
     @Value("${yijia.path.global-prefix}")
     private String globalPrefix;
     @Value("${yijia.domainName}")
@@ -97,13 +106,13 @@ public class SaoBeiPayController {
 
     /***
      * 公众号云闪付拉起支付
-     * @param payInfoRequest
+     * @param rechargeBalance
      * @return
      * @throws Exception
      */
     @RequestMapping(value = {"/yunPayGzh"}, consumes = {"application/json"}, method = {RequestMethod.POST})
     @ResponseBody
-    public String yunPayGzh(@RequestBody PayInfoRequest payInfoRequest) throws Exception {
+    public String yunPayGzh(@RequestBody RechargeBalance rechargeBalance) throws Exception {
         //智慧易加
 //    商户号码：845104816000034
 //    终端号：18241101
@@ -111,78 +120,98 @@ public class SaoBeiPayController {
         Gson gson = new Gson();
         ResultData resultData = null;
 
-        //根据订单号查询订单信息
-        String ordNo = payInfoRequest.getOrdNo();
-        PayOrder payOrder=payOrderService.selectOrderInfoByOrdNo(ordNo);
-        if(payOrder !=null){
-            if(payOrder.getStatus().equals("0")){
-                //String stationId = payInfoRequest.getStationId();
-                Map<String, String> staPayChannelInfo = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
-                if(staPayChannelInfo !=null && staPayChannelInfo.containsKey("merchantNo") && staPayChannelInfo.containsKey("terminalId")
+        if(rechargeBalance !=null && StringUtils.isNotBlank(rechargeBalance.getAmt()) && StringUtils.isNotBlank(rechargeBalance.getOpenId())
+                && StringUtils.isNotBlank(rechargeBalance.getUserType()) && rechargeBalance.getStationId() !=null && StringUtils.isNotBlank(rechargeBalance.getOrderNo())){
+            String amt = rechargeBalance.getAmt();
+            String openId = rechargeBalance.getOpenId();    //公众号的openId
+            Integer stationId = rechargeBalance.getStationId();
+            String userType = rechargeBalance.getUserType();
+            String orderNo = rechargeBalance.getOrderNo();
+            CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();
+            customerCardUseRecord.setOrderNo(orderNo);
+            CustomerCardUseRecord cardRecordByOrderNo = electronicMembershipCardService.getCardRecordByOrderNo(customerCardUseRecord);
+            if(cardRecordByOrderNo !=null ) {
+                if (cardRecordByOrderNo.getStatus() != null && cardRecordByOrderNo.getStatus().equals("0")) {
+                    Map<String, String> staPayChannelInfo = stationService.getStationAppIdAndAppSecret(stationId);
+                    if(staPayChannelInfo !=null && staPayChannelInfo.containsKey("merchantNo") && staPayChannelInfo.containsKey("terminalId")
                         && staPayChannelInfo.containsKey("yunKey") && staPayChannelInfo.containsKey("gzhAppId")){
-                    //创建client
-                    SaobeiApiClient<SaobeiJsPayRequest, SaobeiJsPayResponse> client = new DefaultSaobeiApiClient<>(staPayChannelInfo.get("yunKey"));
-                    //创建requst
-                    SaobeiJsPayRequest requst = new SaobeiJsPayRequest();
-                    requst.setPay_ver("110");
-                    requst.setPay_type("010");
-                    requst.setService_id("012");
-                    requst.setMerchant_no(staPayChannelInfo.get("merchantNo"));                 //商户号
-                    requst.setTerminal_id(staPayChannelInfo.get("terminalId"));                 //终端号
-                    requst.setTerminal_trace(payOrder.getOrderNo());                            //订单号
-                    requst.setTerminal_time(new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()));
-                    //云闪付金额单位为分
-                    BigDecimal totalFee = new BigDecimal(payOrder.getAmt().toString()).multiply(new BigDecimal("100")).setScale(0, BigDecimal.ROUND_DOWN);
-                    logger.info("该订单金额：" + payOrder.getAmt().toString()+"; 拉起云闪付上送金额（单位：分)：" + totalFee.toString());
-                    requst.setTotal_fee(totalFee.toString());
-                    requst.setSub_appid(staPayChannelInfo.get("gzhAppId"));
-                    requst.setOpen_id(payInfoRequest.getOpenId());                      //oJR5R6r4EJhaORFcPap70r_mtFZo   //oRwjv4iHjSUgxNxOJOQ_60Ln7cno
-                    String orderBody = payOrder.getOilName() + " - " +payOrder.getStationName();
-                    requst.setOrder_body(orderBody);
-                    String notifyUrl = "https://" + this.domainName + "/" + this.globalPrefix + "/getYunPayGzhCallback";
-                    //logger.info("回调地址："+ notifyUrl);
-                    requst.setNotify_url(notifyUrl);
-                    //发送请求
-                    System.out.println("请求报文:"+JSON.toJSONString(requst));
-                    SaobeiJsPayResponse response = client.execute(requst);
-                    System.out.println("返回报文:"+JSON.toJSONString(response));
-                    resultData = ResultData.success(response);
+                        logger.info("==============================云闪付 公众号电子卡充值 拉起支付 ** 开始 **============================================");
+                        //创建client
+                        SaobeiApiClient<SaobeiJsPayRequest, SaobeiJsPayResponse> client = new DefaultSaobeiApiClient<>(staPayChannelInfo.get("yunKey"));
+                        //创建requst
+                        SaobeiJsPayRequest requst = new SaobeiJsPayRequest();
+                        requst.setPay_ver("110");
+                        requst.setPay_type("010");
+                        requst.setService_id("012");
+                        requst.setMerchant_no(staPayChannelInfo.get("merchantNo"));                 //商户号
+                        requst.setTerminal_id(staPayChannelInfo.get("terminalId"));                 //终端号
+                        requst.setTerminal_trace(cardRecordByOrderNo.getOrderNo());                 //订单号
+                        requst.setTerminal_time(new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()));
+
+                        BigDecimal totalFee = new BigDecimal(cardRecordByOrderNo.getAmt().toString()).multiply(new BigDecimal("100")).setScale(0, BigDecimal.ROUND_DOWN);
+                        logger.info("该订单金额：" + cardRecordByOrderNo.getAmt().toString()+"; 拉起云闪付上送金额（单位：分)：" + totalFee.toString());
+                        requst.setTotal_fee(totalFee.toString());
+                        requst.setSub_appid(staPayChannelInfo.get("gzhAppId"));
+                        requst.setOpen_id(openId);                      //oJR5R6r4EJhaORFcPap70r_mtFZo   //oRwjv4iHjSUgxNxOJOQ_60Ln7cno
+
+                        Oil oil = new Oil();
+                        oil.setOilsType(cardRecordByOrderNo.getCardOilsType());
+                        if(cardRecordByOrderNo.getCardOilsType().equals("1") || cardRecordByOrderNo.getCardOilsType().equals("2")){
+                            oil.setDictType("oil");
+                        }else {
+                            oil.setDictType("oil_name");
+                        }
+                        String cardName =sysDictDataService.selectOilType(oil).getOilName();
+                        String orderBody = cardName+ "电子卡" + " - " +cardRecordByOrderNo.getStationName();
+                        requst.setOrder_body(orderBody);
+                        String notifyUrl = "https://" + this.domainName + "/" + this.globalPrefix + "/getYunPayGzhCallback";
+                        logger.info("回调地址："+ notifyUrl);
+                        requst.setNotify_url(notifyUrl);
+                        //发送请求
+                        System.out.println("请求报文:"+JSON.toJSONString(requst));
+                        SaobeiJsPayResponse response = client.execute(requst);
+                        System.out.println("返回报文:"+JSON.toJSONString(response));
+                        resultData = ResultData.success(response);
+                        logger.info("==============================云闪付 公众号电子卡 充值 拉起支付 ** 结束 **============================================");
+                    }else {
+                        resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
+                    }
                 }else {
-                    resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
+                    resultData = ResultData.error(CodeMsg.ALREADY_PAY);
                 }
             }else {
-                resultData = ResultData.error(CodeMsg.ALREADY_PAY);
+                resultData=ResultData.error(CodeMsg.YEWU_FAIL,"未查询到订单");
             }
         }else {
-            resultData = ResultData.error(CodeMsg.NO_ORDER);
+            resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
         }
         return gson.toJson(resultData);
     }
 
-    /***
-     * 公众号扫呗支付回调
-     * @param jsonObject
-     * @return
-     */
-    @RequestMapping(value = "/getYunPayGzhCallback", consumes = "application/json", method = RequestMethod.POST)
-    @ResponseBody
-    @Transactional
-    public JSONObject getYunPayGzhCallback(@RequestBody JSONObject jsonObject){
-        JSONObject result = new JSONObject();       //返回给扫呗状态码
-        System.out.println("扫呗调用回调接口返回参数：" + jsonObject);
-        if(jsonObject.containsKey("result_code") && jsonObject.get("result_code").toString().equals("01")){
-
-            //业务逻辑
-
-            //返给扫呗状态码
-            result.put("return_code", "01");
-            result.put("return_msg", "success");
-        }else {
-            result.put("return_code", "02");
-            result.put("return_msg", "fail");
-        }
-        return result;
-    }
+//    /***
+//     * 公众号扫呗支付回调
+//     * @param jsonObject
+//     * @return
+//     */
+//    @RequestMapping(value = "/getYunPayGzhCallback", consumes = "application/json", method = RequestMethod.POST)
+//    @ResponseBody
+//    @Transactional
+//    public JSONObject getYunPayGzhCallback(@RequestBody JSONObject jsonObject){
+//        JSONObject result = new JSONObject();       //返回给扫呗状态码
+//        System.out.println("扫呗调用回调接口返回参数：" + jsonObject);
+//        if(jsonObject.containsKey("result_code") && jsonObject.get("result_code").toString().equals("01")){
+//
+//            //业务逻辑
+//
+//            //返给扫呗状态码
+//            result.put("return_code", "01");
+//            result.put("return_msg", "success");
+//        }else {
+//            result.put("return_code", "02");
+//            result.put("return_msg", "fail");
+//        }
+//        return result;
+//    }
 
     /***
      * 小程序云闪付拉起支付
@@ -211,6 +240,7 @@ public class SaoBeiPayController {
                         && staPayChannelInfo.containsKey("yunKey") && staPayChannelInfo.containsKey("appId")) {
                     //秘钥
                     String yunKey = staPayChannelInfo.get("yunKey");                //23570b46a955484d92038f6a18d2b9d6
+                    logger.info("==============================云闪付 小程序支付油品 拉起支付 ** 开始 **============================================");
                     DefaultSaobeiApiClient defaultSaobeiApiClient = new DefaultSaobeiApiClient(yunKey); //2ef428f4f76c414282e831baea9e4b0e
                     SaobeiMiniPayRequest requst = new SaobeiMiniPayRequest();
                     requst.setPay_ver("100");
@@ -240,17 +270,8 @@ public class SaoBeiPayController {
                     System.out.println("请求报文：" + JSON.toJSONString(requst));
                     SaobeiMiniPayResponse response = (SaobeiMiniPayResponse) defaultSaobeiApiClient.execute(requst);
                     System.out.println("返回报文：" + JSON.toJSONString(response));
-
-//                    {
-//                        'timeStamp': timeStamp,
-//                            'nonceStr': nonceStr,
-//                            'package': payPackage,
-//                            'signType': signType,
-//                            'paySign': paySign,
-//                    }
-
-
                     resultData = ResultData.success(response);
+                    logger.info("==============================云闪付 小程序支付油品 拉起支付 ** 结束 **============================================");
                 }else {
                     resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
                 }

YijiaRestful/src/main/java/com/platform/yijia/param/request/RechargeBalance.java

@@ -47,5 +47,6 @@ public class RechargeBalance {
     private Integer printCount; //打印小票数量
     private String carNo; //车牌号
     private String customerPhone; //客户电话
-    private String customerGrade; //客户等级
+    private String customerGrade; //
+    private String payChannelType;      //支付通道类型
 }