提交代码

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -213,6 +213,15 @@ public class OrderPayController {
                     weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo());
                     profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true)?"Y":"N";
 
+                } else if (store.getSourceType().equals(MerchantStoreSourceType.type5.getNumber())) {
+                    // 查询支付配置
+                    HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type5,GasChannelPayPlatformType.type1 );
+                    if (gasChannelConfig == null) {
+                        throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
+                    }
+                    weChatPayReqInfo.setSub_mch_id(gasChannelConfig.getPayPlatformMerNo());
+                    profitSharing = gasChannelConfig.getProfitSharingStatus().equals(true)?"Y":"N";
+
                 } else {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
                 }

hai-order/src/main/java/com/web/controller/notify/CqNotifyController.java

@@ -1,47 +1,31 @@
-package com.cweb.controller;
+package com.web.controller.notify;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
-import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
-import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSONObject;
-import com.cweb.config.SysConst;
 
-import com.hai.common.exception.ErrorCode;
-import com.hai.common.exception.ErrorHelp;
-import com.hai.common.exception.SysCode;
-import com.hai.common.security.SessionObject;
-import com.hai.common.security.UserCenter;
 import com.hai.common.utils.*;
 import com.hai.config.ChongQingCNPCService;
 import com.hai.config.CommonSysConst;
 import com.hai.dao.HighGasOrderPushMapper;
 import com.hai.entity.*;
 import com.hai.enum_type.OrderPushType;
-import com.hai.model.HighUserModel;
-import com.hai.model.ResponseData;
 import com.hai.service.HighCouponCodeOtherService;
-import com.hai.service.HighUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 
 @Controller
-@RequestMapping(value = "/notify")
+@RequestMapping(value = "/cqNotify")
 @Api(value = "通知")
-public class NotifyController {
+public class CqNotifyController {
 
-    private static final Logger log = LoggerFactory.getLogger(NotifyController.class);
+    private static final Logger log = LoggerFactory.getLogger(CqNotifyController.class);
 
     @Resource
     private HighCouponCodeOtherService couponCodeOtherService;

hai-schedule/src/main/java/com/hai/schedule/HighGasSchedule.java

@@ -151,12 +151,12 @@ public class HighGasSchedule {
         }
     }
 
-    @Scheduled(cron = "10 0 0 * * ?")   // 每日凌晨00:00:10执行一次
+    @Scheduled(cron = "5 0 0 * * ?")   // 每日凌晨00:00:5执行一次
     public void getJiaHaoYouAllStation() throws Exception {
         gasService.getJiaHaoYouAllStation();
     }
 
-    @Scheduled(cron = "10 0 0 * * ?")   // 每日凌晨00:00:10执行一次
+    @Scheduled(cron = "5 0 0 * * ?")   // 每日凌晨00:00:5执行一次
     public void getPayloAllStation() throws Exception {
         gasService.getPayloAllStation();
     }

hai-service/src/main/java/com/hai/config/CommonSysConfig.java

@@ -1,5 +1,6 @@
 package com.hai.config;
 
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Component;
@@ -7,6 +8,7 @@ import org.springframework.stereotype.Component;
 @Component("commonSysConfig")
 @ConfigurationProperties
 @PropertySource("classpath:/commonConfig.properties")
+@Data
 public class CommonSysConfig {
 
     // 嗨森逛域名
@@ -38,6 +40,10 @@ public class CommonSysConfig {
     private String jzPrivateKeyUrl;
     private String jzPublicKeyUrl;
 
+    // paylo系统参数
+    private String payloPartnerId;
+    private String payloShellPlatMerchantKey;
+
     private String qinzhuUrl;
     private String qinzhuUrlToken;
     private String qinzhuHtmlUrl;
@@ -106,608 +112,7 @@ public class CommonSysConfig {
     private String unionRsaKey;
 
     private String fileUrl;
-
     private String wxAppId;
     private String wxAppSecret;
 
-    public String getWxAppId() {
-        return wxAppId;
-    }
-
-    public void setWxAppId(String wxAppId) {
-        this.wxAppId = wxAppId;
-    }
-
-    public String getWxAppSecret() {
-        return wxAppSecret;
-    }
-
-    public void setWxAppSecret(String wxAppSecret) {
-        this.wxAppSecret = wxAppSecret;
-    }
-
-    public String getChongQingCnpcUrl() {
-        return ChongQingCnpcUrl;
-    }
-
-    public void setChongQingCnpcUrl(String chongQingCnpcUrl) {
-        ChongQingCnpcUrl = chongQingCnpcUrl;
-    }
-
-    public String getChongQingCnpcMerNo() {
-        return ChongQingCnpcMerNo;
-    }
-
-    public void setChongQingCnpcMerNo(String chongQingCnpcMerNo) {
-        ChongQingCnpcMerNo = chongQingCnpcMerNo;
-    }
-
-    public String getChongQingCnpcMerKey() {
-        return ChongQingCnpcMerKey;
-    }
-
-    public void setChongQingCnpcMerKey(String chongQingCnpcMerKey) {
-        ChongQingCnpcMerKey = chongQingCnpcMerKey;
-    }
-
-    public String getChongQingCnpcCouponSignKey() {
-        return ChongQingCnpcCouponSignKey;
-    }
-
-    public void setChongQingCnpcCouponSignKey(String chongQingCnpcCouponSignKey) {
-        ChongQingCnpcCouponSignKey = chongQingCnpcCouponSignKey;
-    }
-
-    public String getJzAppId() {
-        return jzAppId;
-    }
-
-    public void setJzAppId(String jzAppId) {
-        this.jzAppId = jzAppId;
-    }
-
-    public String getJzPrivateKeyUrl() {
-        return jzPrivateKeyUrl;
-    }
-
-    public void setJzPrivateKeyUrl(String jzPrivateKeyUrl) {
-        this.jzPrivateKeyUrl = jzPrivateKeyUrl;
-    }
-
-    public String getJzPublicKeyUrl() {
-        return jzPublicKeyUrl;
-    }
-
-    public void setJzPublicKeyUrl(String jzPublicKeyUrl) {
-        this.jzPublicKeyUrl = jzPublicKeyUrl;
-    }
-
-    public String getHuiliantongDistributorId() {
-        return huiliantongDistributorId;
-    }
-
-    public void setHuiliantongDistributorId(String huiliantongDistributorId) {
-        this.huiliantongDistributorId = huiliantongDistributorId;
-    }
-
-    public String getHuiliantongSinopecUrl() {
-        return huiliantongSinopecUrl;
-    }
-
-    public void setHuiliantongSinopecUrl(String huiliantongSinopecUrl) {
-        this.huiliantongSinopecUrl = huiliantongSinopecUrl;
-    }
-
-    public String getShellGroupPartnerId() {
-        return shellGroupPartnerId;
-    }
-
-    public void setShellGroupPartnerId(String shellGroupPartnerId) {
-        this.shellGroupPartnerId = shellGroupPartnerId;
-    }
-
-    public String getShellGroupUrl() {
-        return shellGroupUrl;
-    }
-
-    public void setShellGroupUrl(String shellGroupUrl) {
-        this.shellGroupUrl = shellGroupUrl;
-    }
-
-    public String getShellPlatMerchantId() {
-        return shellPlatMerchantId;
-    }
-
-    public void setShellPlatMerchantId(String shellPlatMerchantId) {
-        this.shellPlatMerchantId = shellPlatMerchantId;
-    }
-
-    public String getShellPlatMerchantKey() {
-        return shellPlatMerchantKey;
-    }
-
-    public void setShellPlatMerchantKey(String shellPlatMerchantKey) {
-        this.shellPlatMerchantKey = shellPlatMerchantKey;
-    }
-
-    public String getUnionAppId() {
-        return unionAppId;
-    }
-
-    public void setUnionAppId(String unionAppId) {
-        this.unionAppId = unionAppId;
-    }
-
-    public String getUnionSecret() {
-        return unionSecret;
-    }
-
-    public void setUnionSecret(String unionSecret) {
-        this.unionSecret = unionSecret;
-    }
-
-    public String getUnionRsaKey() {
-        return unionRsaKey;
-    }
-
-    public void setUnionRsaKey(String unionRsaKey) {
-        this.unionRsaKey = unionRsaKey;
-    }
-
-    public String getTuanYouUrl() {
-        return tuanYouUrl;
-    }
-
-    public void setTuanYouUrl(String tuanYouUrl) {
-        this.tuanYouUrl = tuanYouUrl;
-    }
-
-    public String getTuanYouAppKey() {
-        return tuanYouAppKey;
-    }
-
-    public void setTuanYouAppKey(String tuanYouAppKey) {
-        this.tuanYouAppKey = tuanYouAppKey;
-    }
-
-    public String getTuanYouAppSecret() {
-        return tuanYouAppSecret;
-    }
-
-    public void setTuanYouAppSecret(String tuanYouAppSecret) {
-        this.tuanYouAppSecret = tuanYouAppSecret;
-    }
-
-    public String getTuanYouDieselAccount() {
-        return tuanYouDieselAccount;
-    }
-
-    public void setTuanYouDieselAccount(String tuanYouDieselAccount) {
-        this.tuanYouDieselAccount = tuanYouDieselAccount;
-    }
-
-    public String getTuanYouGasolineAccount() {
-        return tuanYouGasolineAccount;
-    }
-
-    public void setTuanYouGasolineAccount(String tuanYouGasolineAccount) {
-        this.tuanYouGasolineAccount = tuanYouGasolineAccount;
-    }
-
-
-    public String getQianzhuH5url() {
-        return qianzhuH5url;
-    }
-
-    public void setQianzhuH5url(String qianzhuH5url) {
-        this.qianzhuH5url = qianzhuH5url;
-    }
-
-    public String getQinzhuUrl() {
-        return qinzhuUrl;
-    }
-
-    public String getQinzhuUrlToken() {
-        return qinzhuUrlToken;
-    }
-
-    public void setQinzhuUrlToken(String qinzhuUrlToken) {
-        this.qinzhuUrlToken = qinzhuUrlToken;
-    }
-
-    public void setQinzhuUrl(String qinzhuUrl) {
-        this.qinzhuUrl = qinzhuUrl;
-    }
-
-    public String getQinzhuHtmlUrl() {
-        return qinzhuHtmlUrl;
-    }
-
-    public void setQinzhuHtmlUrl(String qinzhuHtmlUrl) {
-        this.qinzhuHtmlUrl = qinzhuHtmlUrl;
-    }
-
-    public String getQinzhuMobileUrl() {
-        return qinzhuMobileUrl;
-    }
-
-    public void setQinzhuMobileUrl(String qinzhuMobileUrl) {
-        this.qinzhuMobileUrl = qinzhuMobileUrl;
-    }
-
-    public String getQinzhuPlatformId() {
-        return qinzhuPlatformId;
-    }
-
-    public void setQinzhuPlatformId(String qinzhuPlatformId) {
-        this.qinzhuPlatformId = qinzhuPlatformId;
-    }
-
-    public String getQinzhuSecret() {
-        return qinzhuSecret;
-    }
-
-    public void setQinzhuSecret(String qinzhuSecret) {
-        this.qinzhuSecret = qinzhuSecret;
-    }
-
-    public String getQianzhuOrderNotify() {
-        return qianzhuOrderNotify;
-    }
-
-    public void setQianzhuOrderNotify(String qianzhuOrderNotify) {
-        this.qianzhuOrderNotify = qianzhuOrderNotify;
-    }
-
-    public String getHuiliantongUrl() {
-        return huiliantongUrl;
-    }
-
-    public void setHuiliantongUrl(String huiliantongUrl) {
-        this.huiliantongUrl = huiliantongUrl;
-    }
-
-    public String getHuiliantongAppNo() {
-        return huiliantongAppNo;
-    }
-
-    public void setHuiliantongAppNo(String huiliantongAppNo) {
-        this.huiliantongAppNo = huiliantongAppNo;
-    }
-
-    public String getHuiliantongAppkey() {
-        return huiliantongAppkey;
-    }
-
-    public void setHuiliantongAppkey(String huiliantongAppkey) {
-        this.huiliantongAppkey = huiliantongAppkey;
-    }
-
-    public String getHuiliantongAppsecret() {
-        return huiliantongAppsecret;
-    }
-
-    public void setHuiliantongAppsecret(String huiliantongAppsecret) {
-        this.huiliantongAppsecret = huiliantongAppsecret;
-    }
-
-    public String getHuiLianTongUnionCardUrl() {
-        return HuiLianTongUnionCardUrl;
-    }
-
-    public void setHuiLianTongUnionCardUrl(String huiLianTongUnionCardUrl) {
-        HuiLianTongUnionCardUrl = huiLianTongUnionCardUrl;
-    }
-
-    public String getHuiLianTongUnionCardAccessCode() {
-        return HuiLianTongUnionCardAccessCode;
-    }
-
-    public void setHuiLianTongUnionCardAccessCode(String huiLianTongUnionCardAccessCode) {
-        HuiLianTongUnionCardAccessCode = huiLianTongUnionCardAccessCode;
-    }
-
-    public String getHuiLianTongUnionCardSignCode() {
-        return HuiLianTongUnionCardSignCode;
-    }
-
-    public void setHuiLianTongUnionCardSignCode(String huiLianTongUnionCardSignCode) {
-        HuiLianTongUnionCardSignCode = huiLianTongUnionCardSignCode;
-    }
-
-    public String getUnionPayUrl() {
-        return unionPayUrl;
-    }
-
-    public void setUnionPayUrl(String unionPayUrl) {
-        this.unionPayUrl = unionPayUrl;
-    }
-
-    public String getUnionPayChannelid() {
-        return unionPayChannelid;
-    }
-
-    public void setUnionPayChannelid(String unionPayChannelid) {
-        this.unionPayChannelid = unionPayChannelid;
-    }
-
-    public String getUnionPayMerid() {
-        return unionPayMerid;
-    }
-
-    public void setUnionPayMerid(String unionPayMerid) {
-        this.unionPayMerid = unionPayMerid;
-    }
-
-    public String getUnionPayTermid() {
-        return unionPayTermid;
-    }
-
-    public void setUnionPayTermid(String unionPayTermid) {
-        this.unionPayTermid = unionPayTermid;
-    }
-
-    public String getUnionPaySignKey() {
-        return unionPaySignKey;
-    }
-
-    public void setUnionPaySignKey(String unionPaySignKey) {
-        this.unionPaySignKey = unionPaySignKey;
-    }
-
-    public String getUnionPayNotifyUrl() {
-        return unionPayNotifyUrl;
-    }
-
-    public void setUnionPayNotifyUrl(String unionPayNotifyUrl) {
-        this.unionPayNotifyUrl = unionPayNotifyUrl;
-    }
-
-    public String getUnionPayTelNotifyUrl() {
-        return unionPayTelNotifyUrl;
-    }
-
-    public void setUnionPayTelNotifyUrl(String unionPayTelNotifyUrl) {
-        this.unionPayTelNotifyUrl = unionPayTelNotifyUrl;
-    }
-
-    public String getUnionStagingPayUrl() {
-        return unionStagingPayUrl;
-    }
-
-    public void setUnionStagingPayUrl(String unionStagingPayUrl) {
-        this.unionStagingPayUrl = unionStagingPayUrl;
-    }
-
-    public String getUnionStagingPayOrgId() {
-        return unionStagingPayOrgId;
-    }
-
-    public void setUnionStagingPayOrgId(String unionStagingPayOrgId) {
-        this.unionStagingPayOrgId = unionStagingPayOrgId;
-    }
-
-    public String getUnionStagingPayOrgMerCode() {
-        return unionStagingPayOrgMerCode;
-    }
-
-    public void setUnionStagingPayOrgMerCode(String unionStagingPayOrgMerCode) {
-        this.unionStagingPayOrgMerCode = unionStagingPayOrgMerCode;
-    }
-
-    public String getUnionStagingPayOrgTermNo() {
-        return unionStagingPayOrgTermNo;
-    }
-
-    public void setUnionStagingPayOrgTermNo(String unionStagingPayOrgTermNo) {
-        this.unionStagingPayOrgTermNo = unionStagingPayOrgTermNo;
-    }
-
-    public String getUnionStagingPayNotifyUrl() {
-        return unionStagingPayNotifyUrl;
-    }
-
-    public void setUnionStagingPayNotifyUrl(String unionStagingPayNotifyUrl) {
-        this.unionStagingPayNotifyUrl = unionStagingPayNotifyUrl;
-    }
-
-    public String getWx_cert() {
-        return wx_cert;
-    }
-
-    public void setWx_cert(String wx_cert) {
-        this.wx_cert = wx_cert;
-    }
-
-    public String getTelApiKey() {
-        return telApiKey;
-    }
-
-    public void setTelApiKey(String telApiKey) {
-        this.telApiKey = telApiKey;
-    }
-
-    public String getTelApiSecret() {
-        return telApiSecret;
-    }
-
-    public void setTelApiSecret(String telApiSecret) {
-        this.telApiSecret = telApiSecret;
-    }
-
-    public String getTelMemberId() {
-        return telMemberId;
-    }
-
-    public void setTelMemberId(String telMemberId) {
-        this.telMemberId = telMemberId;
-    }
-
-    public String getTelUrl() {
-        return telUrl;
-    }
-
-    public void setTelUrl(String telUrl) {
-        this.telUrl = telUrl;
-    }
-
-    public String getCzOrderNotify() {
-        return czOrderNotify;
-    }
-
-    public void setCzOrderNotify(String czOrderNotify) {
-        this.czOrderNotify = czOrderNotify;
-    }
-
-    public String getHltMembershipLevelAccessCode() {
-        return HltMembershipLevelAccessCode;
-    }
-
-    public void setHltMembershipLevelAccessCode(String hltMembershipLevelAccessCode) {
-        HltMembershipLevelAccessCode = hltMembershipLevelAccessCode;
-    }
-
-    public String getHltMembershipLevelSignCode() {
-        return HltMembershipLevelSignCode;
-    }
-
-    public void setHltMembershipLevelSignCode(String hltMembershipLevelSignCode) {
-        HltMembershipLevelSignCode = hltMembershipLevelSignCode;
-    }
-
-    public String getJjNotifyUrl() {
-        return JjNotifyUrl;
-    }
-
-    public void setJjNotifyUrl(String jjNotifyUrl) {
-        JjNotifyUrl = jjNotifyUrl;
-    }
-
-    public String getJjAppKey() {
-        return JjAppKey;
-    }
-
-    public void setJjAppKey(String jjAppKey) {
-        JjAppKey = jjAppKey;
-    }
-
-    public String getJjUrl() {
-        return JjUrl;
-    }
-
-    public void setJjUrl(String jjUrl) {
-        JjUrl = jjUrl;
-    }
-
-    public String getJjAppSecret() {
-        return JjAppSecret;
-    }
-
-    public void setJjAppSecret(String jjAppSecret) {
-        JjAppSecret = jjAppSecret;
-    }
-
-    public String getHsgDomainName() {
-        return hsgDomainName;
-    }
-
-    public void setHsgDomainName(String hsgDomainName) {
-        this.hsgDomainName = hsgDomainName;
-    }
-
-    public String getLyApiKey() {
-        return lyApiKey;
-    }
-
-    public void setLyApiKey(String lyApiKey) {
-        this.lyApiKey = lyApiKey;
-    }
-
-    public String getLyMemberId() {
-        return lyMemberId;
-    }
-
-    public void setLyMemberId(String lyMemberId) {
-        this.lyMemberId = lyMemberId;
-    }
-
-    public String getLyPostUrl() {
-        return LyPostUrl;
-    }
-
-    public void setLyPostUrl(String lyPostUrl) {
-        LyPostUrl = lyPostUrl;
-    }
-
-    public String getLyNotifyUrl() {
-        return LyNotifyUrl;
-    }
-
-    public void setLyNotifyUrl(String lyNotifyUrl) {
-        LyNotifyUrl = lyNotifyUrl;
-    }
-
-    public String getThirdAppKey() {
-        return thirdAppKey;
-    }
-
-    public void setThirdAppKey(String thirdAppKey) {
-        this.thirdAppKey = thirdAppKey;
-    }
-
-    public String getThirdAppSecret() {
-        return thirdAppSecret;
-    }
-
-    public void setThirdAppSecret(String thirdAppSecret) {
-        this.thirdAppSecret = thirdAppSecret;
-    }
-
-    public String getThirdPostUrl() {
-        return thirdPostUrl;
-    }
-
-    public void setThirdPostUrl(String thirdPostUrl) {
-        this.thirdPostUrl = thirdPostUrl;
-    }
-
-    public String getCyApiKey() {
-        return CyApiKey;
-    }
-
-    public void setCyApiKey(String cyApiKey) {
-        CyApiKey = cyApiKey;
-    }
-
-    public String getCyAppSecret() {
-        return CyAppSecret;
-    }
-
-    public void setCyAppSecret(String cyAppSecret) {
-        CyAppSecret = cyAppSecret;
-    }
-
-    public String getCyPostUrl() {
-        return CyPostUrl;
-    }
-
-    public void setCyPostUrl(String cyPostUrl) {
-        CyPostUrl = cyPostUrl;
-    }
-
-    public String getGasDefaultOilStationImg() {
-        return gasDefaultOilStationImg;
-    }
-
-    public void setGasDefaultOilStationImg(String gasDefaultOilStationImg) {
-        this.gasDefaultOilStationImg = gasDefaultOilStationImg;
-    }
-
-    public String getFileUrl() {
-        return fileUrl;
-    }
-
-    public void setFileUrl(String fileUrl) {
-        this.fileUrl = fileUrl;
-    }
 }

hai-service/src/main/java/com/hai/config/PayloService.java

@@ -26,8 +26,8 @@ import java.util.*;
 @Component
 public class PayloService {
 
-    private static final String partnerId = "S0302207281600105753";
+    private static final String partnerId = CommonSysConst.getSysConfig().getPayloPartnerId();
-    private static final String ShellPlatMerchantKey = "wqisfmkzea6mwd7ogbyh3488jv0hqhdj";
+    private static final String ShellPlatMerchantKey = CommonSysConst.getSysConfig().getPayloShellPlatMerchantKey();
 
     @Resource
     private BsTripartiteReqLogService reqLogService;

hai-service/src/main/java/com/hai/enum_type/GasChannel.java

@@ -10,6 +10,7 @@ public enum GasChannel {
     type2(2 , "团油"),
     type3(3 , "加好油"),
     type4(4 , "金猪加油"),
+    type5(5 , "paylo系统"),
     ;
 
     private Integer type;

hai-service/src/main/java/com/hai/order/service/impl/OrderPayBeforeServiceImpl.java

@@ -76,6 +76,13 @@ public class OrderPayBeforeServiceImpl implements OrderPayBeforeService {
                 if (gasChannelConfig == null) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
                 }
+
+            } else if (store.getSourceType().equals(MerchantStoreSourceType.type5.getNumber())) {
+                // 查询支付配置
+                HighGasChannelConfig gasChannelConfig = gasChannelConfigService.getConfig(GasChannel.type5,GasChannelPayPlatformType.type1 );
+                if (gasChannelConfig == null) {
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
+                }
             } else {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未配置支付参数，请稍后重试！");
             }

hai-service/src/main/java/com/hai/service/HighGasService.java

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 public interface HighGasService {
 
     /**
+     * 重庆壳牌
      * 获取渠道商【加好油】全量加油站
      */
     void getJiaHaoYouAllStation() throws Exception;
@@ -21,6 +22,7 @@ public interface HighGasService {
     void getPayloAllStation() throws Exception;
 
     /**
+     * 
      * 获取渠道商【金猪加油】全量加油站
      */
     void getJinZhuAllStation() throws Exception;

hai-service/src/main/java/com/hai/service/impl/HighGasDiscountOilPriceServiceImpl.java

@@ -10,7 +10,6 @@ import com.hai.dao.HighGasDiscountOilPriceMapper;
 import com.hai.entity.*;
 import com.hai.enum_type.MerchantStoreSourceType;
 import com.hai.model.GasPayPriceModel;
-import com.hai.model.HighMerchantStoreModel;
 import com.hai.service.*;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -156,6 +155,7 @@ public class HighGasDiscountOilPriceServiceImpl implements HighGasDiscountOilPri
         if (store.getSourceType().equals(MerchantStoreSourceType.type1.getNumber())
                 || store.getSourceType().equals(MerchantStoreSourceType.type3.getNumber())
                 || store.getSourceType().equals(MerchantStoreSourceType.type4.getNumber())
+                || store.getSourceType().equals(MerchantStoreSourceType.type5.getNumber())
         ) {
 
             // 嗨森逛平台价    油枪价 * 折扣

hai-service/src/main/resources/dev/commonConfig.properties

@@ -20,6 +20,10 @@ shellGroupPartnerId=S0302207281600105753
 shellPlatMerchantId=S0302206141000105717
 shellPlatMerchantKey=wqisfmkzea6mwd7ogbyh3488jv0hqhdj
 
+# paylo configuration parameters
+payloPartnerId=S0302207281600105753
+payloShellPlatMerchantKey=wqisfmkzea6mwd7ogbyh3488jv0hqhdj
+
 # JinZhu configuration parameters
 jzAppId=app_huidui_prod_01
 jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key

hai-service/src/main/resources/prod-9401/commonConfig.properties

@@ -17,6 +17,10 @@ shellGroupPartnerId=S0302208021401950202
 shellPlatMerchantId=S0302206141001919666
 shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
 
+# paylo configuration parameters
+payloPartnerId=S0302301161601992103
+payloShellPlatMerchantKey=s8w42iq4v5dpkh2rfok1aa131yqo140t
+
 # JinZhu configuration parameters
 jzAppId=app_huidui_prod_01
 jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key

hai-service/src/main/resources/prod/commonConfig.properties

@@ -17,6 +17,10 @@ shellGroupPartnerId=S0302208021401950202
 shellPlatMerchantId=S0302206141001919666
 shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
 
+# paylo configuration parameters
+payloPartnerId=S0302301161601992103
+payloShellPlatMerchantKey=s8w42iq4v5dpkh2rfok1aa131yqo140t
+
 # JinZhu configuration parameters
 jzAppId=app_huidui_prod_01
 jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key