提交代码

hai-bweb/src/main/java/com/bweb/controller/HighMerStoreAmountController.java

@@ -92,6 +92,44 @@ public class HighMerStoreAmountController {
         }
     }
 
+    @RequestMapping(value = "/setAmountsEarlyWarning", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "设置加油站预警值")
+    public ResponseData setAmountsEarlyWarning(@RequestBody JSONObject body) {
+        try {
+            UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class);
+            if (userInfoModel == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, "");
+            }
+            if (userInfoModel.getBsCompany() == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, "");
+            }
+            if (body.getLong("storeId") == null || body.getBigDecimal("earlyWarning") == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+            if (body.getBigDecimal("earlyWarning").compareTo(new BigDecimal("0")) == -1) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "充值金额不能小于0");
+            }
+            // 门店
+            HighMerchantStoreAccount accountDetail = merchantStoreAccountService.getStoreAccountDetail(body.getLong("storeId"));
+            if (accountDetail == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "此加油站无法设置预警");
+            }
+            accountDetail.setAmountsEarlyWarning(body.getBigDecimal("earlyWarning"));
+            merchantStoreAccountService.editStoreAccount(accountDetail);
+
+            return ResponseMsgUtil.success("操作成功");
+
+        } catch (DeadlockLoserDataAccessException deadlockLoserDataAccessException) {
+            log.error("HighActivityController -> userLottery() error!", "服务器繁忙");
+            return ResponseMsgUtil.builderResponse(ErrorCode.SERVER_BUSY_ERROR.getCode(),ErrorCode.SERVER_BUSY_ERROR.getMsg(),null);
+
+        } catch (Exception e) {
+            log.error("HighCompanyAmountController --> recharge() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
     @RequestMapping(value = "/getAccountRecordList", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询账户记录列表")

hai-cweb/src/main/java/com/cweb/controller/HighGasController.java

@@ -101,7 +101,8 @@ public class HighGasController {
                         }
                     }
 
-                    if (StringUtils.isNotBlank(longitude) && StringUtils.isNotBlank(latitude)) {
+                    if (StringUtils.isNotBlank(longitude) && StringUtils.isNotBlank(latitude)
+                            && StringUtils.isNotBlank(store.get("longitude").toString()) && StringUtils.isNotBlank(store.get("latitude").toString())) {
                         double distance = CoordCommonUtil.getDistance(Double.valueOf(store.get("latitude").toString()), Double.valueOf(store.get("longitude").toString()), Double.valueOf(latitude), Double.valueOf(longitude));
                         store.put("distance", Math.round(distance/100d)/10d);
                     } else {
@@ -289,8 +290,14 @@ public class HighGasController {
                 param.put("gasId", store.getStoreKey());
                 param.put("gasName", store.getStoreName());
                 param.put("gasAddress", store.getAddress());
+
+                if (store.getSourceType().equals(1)) {
                     param.put("gasLogoBig", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo());
                     param.put("gasLogoSmall", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo());
+                } else {
+                    param.put("gasLogoBig", store.getStoreLogo());
+                    param.put("gasLogoSmall", store.getStoreLogo());
+                }
                 param.put("gasAddressLatitude", store.getLatitude());
                 param.put("gasAddressLongitude", store.getLongitude());
 
@@ -483,8 +490,13 @@ public class HighGasController {
                 param.put("gasId", store.getStoreKey());
                 param.put("gasName", store.getStoreName());
                 param.put("gasAddress", store.getAddress());
+                if (store.getSourceType().equals(1)) {
                     param.put("gasLogoBig", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo());
                     param.put("gasLogoSmall", CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo());
+                } else {
+                    param.put("gasLogoBig", store.getStoreLogo());
+                    param.put("gasLogoSmall", store.getStoreLogo());
+                }
                 param.put("gasAddressLatitude", store.getLatitude());
                 param.put("gasAddressLongitude", store.getLongitude());
                 // 距离

hai-cweb/src/main/java/com/cweb/controller/HighOrderController.java

@@ -335,10 +335,10 @@ public class HighOrderController {
                     childOrder.setGasPricePreferences(priceModel.getPricePreferences());
 
                     // 来源类型  1：平台自建   2：团油
-                    if (store.getSourceType().equals(2)) {
+                    if (store.getSourceType().equals(1)) {
-                        childOrder.setGoodsImg(store.getStoreLogo());
-                    } else {
                         childOrder.setGoodsImg(CommonSysConst.getSysConfig().getHsgDomainName()+"/filesystem/"+store.getStoreLogo());
+                    } else {
+                        childOrder.setGoodsImg(store.getStoreLogo());
                     }
 
                     childOrder.setGoodsName(store.getStoreName());

hai-service/src/main/java/com/hai/dao/HighGasOilPriceMapperExt.java

@@ -33,6 +33,8 @@ public interface HighGasOilPriceMapperExt {
             " AND a.`status` = 1 " +
             " AND b.region_id = #{regionId} " +
             " AND a.oil_no_name = #{oilNoName}" +
+            " AND b.longitude is not null" +
+            " AND b.latitude is not null" +
             "<if test='storeName != null'> and b.store_name like '%${storeName}%'</if>" +
             " </script>" )
     List<Map<String,Object>> selectStoreListByOilNo(@Param("storeName") String storeName, @Param("regionId") Long regionId, @Param("oilNoName") String oilNoName);

hai-service/src/main/java/com/hai/dao/HighMerchantStoreAccountMapper.java

@@ -40,11 +40,13 @@ public interface HighMerchantStoreAccountMapper extends HighMerchantStoreAccount
 
     @Insert({
         "insert into high_merchant_store_account (store_id, account_no, ",
-        "amounts, `status`, ",
+        "amounts, amounts_early_warning, ",
+        "amounts_early_warning_status, `status`, ",
         "create_time, update_time, ",
         "ext_1, ext_2, ext_3)",
         "values (#{storeId,jdbcType=BIGINT}, #{accountNo,jdbcType=VARCHAR}, ",
-        "#{amounts,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ",
+        "#{amounts,jdbcType=DECIMAL}, #{amountsEarlyWarning,jdbcType=DECIMAL}, ",
+        "#{amountsEarlyWarningStatus,jdbcType=BIT}, #{status,jdbcType=INTEGER}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
         "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
@@ -61,6 +63,8 @@ public interface HighMerchantStoreAccountMapper extends HighMerchantStoreAccount
         @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
         @Result(column="account_no", property="accountNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="amounts", property="amounts", jdbcType=JdbcType.DECIMAL),
+        @Result(column="amounts_early_warning", property="amountsEarlyWarning", jdbcType=JdbcType.DECIMAL),
+        @Result(column="amounts_early_warning_status", property="amountsEarlyWarningStatus", jdbcType=JdbcType.BIT),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@@ -72,8 +76,8 @@ public interface HighMerchantStoreAccountMapper extends HighMerchantStoreAccount
 
     @Select({
         "select",
-        "id, store_id, account_no, amounts, `status`, create_time, update_time, ext_1, ",
+        "id, store_id, account_no, amounts, amounts_early_warning, amounts_early_warning_status, ",
-        "ext_2, ext_3",
+        "`status`, create_time, update_time, ext_1, ext_2, ext_3",
         "from high_merchant_store_account",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -82,6 +86,8 @@ public interface HighMerchantStoreAccountMapper extends HighMerchantStoreAccount
         @Result(column="store_id", property="storeId", jdbcType=JdbcType.BIGINT),
         @Result(column="account_no", property="accountNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="amounts", property="amounts", jdbcType=JdbcType.DECIMAL),
+        @Result(column="amounts_early_warning", property="amountsEarlyWarning", jdbcType=JdbcType.DECIMAL),
+        @Result(column="amounts_early_warning_status", property="amountsEarlyWarningStatus", jdbcType=JdbcType.BIT),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@@ -105,6 +111,8 @@ public interface HighMerchantStoreAccountMapper extends HighMerchantStoreAccount
         "set store_id = #{storeId,jdbcType=BIGINT},",
           "account_no = #{accountNo,jdbcType=VARCHAR},",
           "amounts = #{amounts,jdbcType=DECIMAL},",
+          "amounts_early_warning = #{amountsEarlyWarning,jdbcType=DECIMAL},",
+          "amounts_early_warning_status = #{amountsEarlyWarningStatus,jdbcType=BIT},",
           "`status` = #{status,jdbcType=INTEGER},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",

hai-service/src/main/java/com/hai/dao/HighMerchantStoreAccountSqlProvider.java

@@ -40,6 +40,14 @@ public class HighMerchantStoreAccountSqlProvider {
             sql.VALUES("amounts", "#{amounts,jdbcType=DECIMAL}");
         }
         
+        if (record.getAmountsEarlyWarning() != null) {
+            sql.VALUES("amounts_early_warning", "#{amountsEarlyWarning,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getAmountsEarlyWarningStatus() != null) {
+            sql.VALUES("amounts_early_warning_status", "#{amountsEarlyWarningStatus,jdbcType=BIT}");
+        }
+        
         if (record.getStatus() != null) {
             sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
         }
@@ -77,6 +85,8 @@ public class HighMerchantStoreAccountSqlProvider {
         sql.SELECT("store_id");
         sql.SELECT("account_no");
         sql.SELECT("amounts");
+        sql.SELECT("amounts_early_warning");
+        sql.SELECT("amounts_early_warning_status");
         sql.SELECT("`status`");
         sql.SELECT("create_time");
         sql.SELECT("update_time");
@@ -116,6 +126,14 @@ public class HighMerchantStoreAccountSqlProvider {
             sql.SET("amounts = #{record.amounts,jdbcType=DECIMAL}");
         }
         
+        if (record.getAmountsEarlyWarning() != null) {
+            sql.SET("amounts_early_warning = #{record.amountsEarlyWarning,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getAmountsEarlyWarningStatus() != null) {
+            sql.SET("amounts_early_warning_status = #{record.amountsEarlyWarningStatus,jdbcType=BIT}");
+        }
+        
         if (record.getStatus() != null) {
             sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         }
@@ -152,6 +170,8 @@ public class HighMerchantStoreAccountSqlProvider {
         sql.SET("store_id = #{record.storeId,jdbcType=BIGINT}");
         sql.SET("account_no = #{record.accountNo,jdbcType=VARCHAR}");
         sql.SET("amounts = #{record.amounts,jdbcType=DECIMAL}");
+        sql.SET("amounts_early_warning = #{record.amountsEarlyWarning,jdbcType=DECIMAL}");
+        sql.SET("amounts_early_warning_status = #{record.amountsEarlyWarningStatus,jdbcType=BIT}");
         sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
@@ -180,6 +200,14 @@ public class HighMerchantStoreAccountSqlProvider {
             sql.SET("amounts = #{amounts,jdbcType=DECIMAL}");
         }
         
+        if (record.getAmountsEarlyWarning() != null) {
+            sql.SET("amounts_early_warning = #{amountsEarlyWarning,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getAmountsEarlyWarningStatus() != null) {
+            sql.SET("amounts_early_warning_status = #{amountsEarlyWarningStatus,jdbcType=BIT}");
+        }
+        
         if (record.getStatus() != null) {
             sql.SET("`status` = #{status,jdbcType=INTEGER}");
         }

hai-service/src/main/java/com/hai/entity/HighMerchantStoreAccount.java

@@ -31,6 +31,16 @@ public class HighMerchantStoreAccount implements Serializable {
      */
     private BigDecimal amounts;
 
+    /**
+     * 账户余额不足预警余额
+     */
+    private BigDecimal amountsEarlyWarning;
+
+    /**
+     * 账户余额不足预警状态，0：正常  1：不足
+     */
+    private Boolean amountsEarlyWarningStatus;
+
     /**
      * 状态  0：删除  1：正常
      */
@@ -86,6 +96,22 @@ public class HighMerchantStoreAccount implements Serializable {
         this.amounts = amounts;
     }
 
+    public BigDecimal getAmountsEarlyWarning() {
+        return amountsEarlyWarning;
+    }
+
+    public void setAmountsEarlyWarning(BigDecimal amountsEarlyWarning) {
+        this.amountsEarlyWarning = amountsEarlyWarning;
+    }
+
+    public Boolean getAmountsEarlyWarningStatus() {
+        return amountsEarlyWarningStatus;
+    }
+
+    public void setAmountsEarlyWarningStatus(Boolean amountsEarlyWarningStatus) {
+        this.amountsEarlyWarningStatus = amountsEarlyWarningStatus;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -150,6 +176,8 @@ public class HighMerchantStoreAccount implements Serializable {
             && (this.getStoreId() == null ? other.getStoreId() == null : this.getStoreId().equals(other.getStoreId()))
             && (this.getAccountNo() == null ? other.getAccountNo() == null : this.getAccountNo().equals(other.getAccountNo()))
             && (this.getAmounts() == null ? other.getAmounts() == null : this.getAmounts().equals(other.getAmounts()))
+            && (this.getAmountsEarlyWarning() == null ? other.getAmountsEarlyWarning() == null : this.getAmountsEarlyWarning().equals(other.getAmountsEarlyWarning()))
+            && (this.getAmountsEarlyWarningStatus() == null ? other.getAmountsEarlyWarningStatus() == null : this.getAmountsEarlyWarningStatus().equals(other.getAmountsEarlyWarningStatus()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
@@ -166,6 +194,8 @@ public class HighMerchantStoreAccount implements Serializable {
         result = prime * result + ((getStoreId() == null) ? 0 : getStoreId().hashCode());
         result = prime * result + ((getAccountNo() == null) ? 0 : getAccountNo().hashCode());
         result = prime * result + ((getAmounts() == null) ? 0 : getAmounts().hashCode());
+        result = prime * result + ((getAmountsEarlyWarning() == null) ? 0 : getAmountsEarlyWarning().hashCode());
+        result = prime * result + ((getAmountsEarlyWarningStatus() == null) ? 0 : getAmountsEarlyWarningStatus().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
@@ -185,6 +215,8 @@ public class HighMerchantStoreAccount implements Serializable {
         sb.append(", storeId=").append(storeId);
         sb.append(", accountNo=").append(accountNo);
         sb.append(", amounts=").append(amounts);
+        sb.append(", amountsEarlyWarning=").append(amountsEarlyWarning);
+        sb.append(", amountsEarlyWarningStatus=").append(amountsEarlyWarningStatus);
         sb.append(", status=").append(status);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);

hai-service/src/main/java/com/hai/entity/HighMerchantStoreAccountExample.java

@@ -376,6 +376,126 @@ public class HighMerchantStoreAccountExample {
             return (Criteria) this;
         }
 
+        public Criteria andAmountsEarlyWarningIsNull() {
+            addCriterion("amounts_early_warning is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningIsNotNull() {
+            addCriterion("amounts_early_warning is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningEqualTo(BigDecimal value) {
+            addCriterion("amounts_early_warning =", value, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningNotEqualTo(BigDecimal value) {
+            addCriterion("amounts_early_warning <>", value, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningGreaterThan(BigDecimal value) {
+            addCriterion("amounts_early_warning >", value, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("amounts_early_warning >=", value, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningLessThan(BigDecimal value) {
+            addCriterion("amounts_early_warning <", value, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("amounts_early_warning <=", value, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningIn(List<BigDecimal> values) {
+            addCriterion("amounts_early_warning in", values, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningNotIn(List<BigDecimal> values) {
+            addCriterion("amounts_early_warning not in", values, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amounts_early_warning between", value1, value2, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("amounts_early_warning not between", value1, value2, "amountsEarlyWarning");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusIsNull() {
+            addCriterion("amounts_early_warning_status is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusIsNotNull() {
+            addCriterion("amounts_early_warning_status is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusEqualTo(Boolean value) {
+            addCriterion("amounts_early_warning_status =", value, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusNotEqualTo(Boolean value) {
+            addCriterion("amounts_early_warning_status <>", value, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusGreaterThan(Boolean value) {
+            addCriterion("amounts_early_warning_status >", value, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("amounts_early_warning_status >=", value, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusLessThan(Boolean value) {
+            addCriterion("amounts_early_warning_status <", value, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusLessThanOrEqualTo(Boolean value) {
+            addCriterion("amounts_early_warning_status <=", value, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusIn(List<Boolean> values) {
+            addCriterion("amounts_early_warning_status in", values, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusNotIn(List<Boolean> values) {
+            addCriterion("amounts_early_warning_status not in", values, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusBetween(Boolean value1, Boolean value2) {
+            addCriterion("amounts_early_warning_status between", value1, value2, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andAmountsEarlyWarningStatusNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("amounts_early_warning_status not between", value1, value2, "amountsEarlyWarningStatus");
+            return (Criteria) this;
+        }
+
         public Criteria andStatusIsNull() {
             addCriterion("`status` is null");
             return (Criteria) this;

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

@@ -1,5 +1,6 @@
 hsgDomainName=https://hsgcs.dctpay.com
 gasDefaultOilStationImg=https://hsgcs.dctpay.com/filesystem/default/default_oil_station.jpg
+
 # TuanYou configuration parameters
 tuanYouUrl=https://test05-motorcade-hcs.czb365.com
 tuanYouAppKey=231599775566496
@@ -7,11 +8,11 @@ tuanYouAppSecret=cbfab3c550d6142a779c5196c9416342
 tuanYouDieselAccount=c009bidg4400
 tuanYouGasolineAccount=c009bic04400
 
-#
+# JiaHaoYou configuration parameters
-shellGroupUrl=http://openapi.ngrok.xinyebang.cn/gateway.html
+shellGroupUrl=http://api.shenmapay.com/gateway.html
-shellGroupPartnerId=S0302207281600105753
+shellGroupPartnerId=S0302208021401950202
-shellPlatMerchantId=S0302206141000105717
+shellPlatMerchantId=S0302206141001919666
-shellPlatMerchantKey=wqisfmkzea6mwd7ogbyh3488jv0hqhdj
+shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
 
 # ????
 qinzhuUrl=https://live-test.qianzhu8.com

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

@@ -1,15 +1,18 @@
 hsgDomainName=https://hsg.dctpay.com
 gasDefaultOilStationImg=https://hsgcs.dctpay.com/filesystem/default/default_oil_station.jpg
 
+# TuanYou configuration parameters
 tuanYouUrl=https://hcs.czb365.com
 tuanYouAppKey=210091174083104
 tuanYouAppSecret=f9811df6791d309bf48f4a8db9edaa45
 tuanYouDieselAccount=9hp52qgg4400
 tuanYouGasolineAccount=9hp52qf04400
-# tuanYouAppKey=232373843366592
+
-# tuanYouAppSecret=b07cca748a3b83e27e4821d2a8423d91
+# JiaHaoYou configuration parameters
-# tuanYouDieselAccount=c2qitcag4400
+shellGroupUrl=http://openapi.ngrok.xinyebang.cn/gateway.html
-# tuanYouGasolineAccount=c2qitc984400
+shellGroupPartnerId=S0302207281600105753
+shellPlatMerchantId=S0302206141000105717
+shellPlatMerchantKey=wqisfmkzea6mwd7ogbyh3488jv0hqhdj
 
 qinzhuUrl=https://live.qianzhu8.com
 qinzhuUrlToken=https://live.qianzhu8.com/gateway

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

@@ -11,6 +11,12 @@ tuanYouGasolineAccount=9hp52qf04400
 # tuanYouDieselAccount=c2qitcag4400
 # tuanYouGasolineAccount=c2qitc984400
 
+# JiaHaoYou configuration parameters
+shellGroupUrl=http://api.shenmapay.com/gateway.html
+shellGroupPartnerId=S0302208021401950202
+shellPlatMerchantId=S0302206141001919666
+shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
+
 qinzhuUrl=https://live.qianzhu8.com
 qinzhuUrlToken=https://live.qianzhu8.com/gateway
 qinzhuHtmlUrl=https://qz.dctpay.com

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

@@ -11,6 +11,12 @@ tuanYouGasolineAccount=9hp52qf04400
 # tuanYouDieselAccount=c2qitcag4400
 # tuanYouGasolineAccount=c2qitc984400
 
+# JiaHaoYou configuration parameters
+shellGroupUrl=http://api.shenmapay.com/gateway.html
+shellGroupPartnerId=S0302208021401950202
+shellPlatMerchantId=S0302206141001919666
+shellPlatMerchantKey=pic1yj2l3zby5ywpznrtdz7458ce2soj
+
 qinzhuUrl=https://live.qianzhu8.com
 qinzhuUrlToken=https://live.qianzhu8.com/gateway
 qinzhuHtmlUrl=https://qz.dctpay.com