提交代码

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

@@ -12,14 +12,13 @@ import com.hai.common.utils.PageUtil;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.config.RechargeConfig;
 import com.hai.entity.BsOperationLog;
+import com.hai.entity.BsRechargeCode;
 import com.hai.entity.OutRechargePrice;
+import com.hai.entity.SecDictionary;
 import com.hai.model.OutRechargePriceModel;
 import com.hai.model.ResponseData;
 import com.hai.model.UserInfoModel;
-import com.hai.service.BsConfigService;
-import com.hai.service.BsOperationLogService;
-import com.hai.service.CommonService;
-import com.hai.service.OutRechargePriceService;
+import com.hai.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -47,12 +46,18 @@ public class OutRechargePriceController {
     @Resource
     private OutRechargePriceService outRechargePriceService;
 
+    @Resource
+    private CommonService commonService;
+
     @Resource
     private BsConfigService bsConfigService;
 
     @Resource
     private BsOperationLogService bsOperationLogService;
 
+    @Resource
+    private BsRechargeCodeService bsRechargeCodeService;
+
     @RequestMapping(value = "/getListOutRechargePrice", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询充值金额列表")
@@ -291,6 +296,34 @@ public class OutRechargePriceController {
     public ResponseData getProductsList() {
         try {
 
+            return ResponseMsgUtil.success(RechargeConfig.getProductsListByLy());
+
+        } catch (Exception e) {
+            log.error("HighOrderController --> unionStagingPay() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
+    @RequestMapping(value = "/getRechargeCodeList", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "获取充值产品编码列表")
+    public ResponseData getRechargeCodeList(@RequestParam(value = "id", required = true) Long id,
+                                            @RequestParam(value = "codeType", required = true) String codeType) {
+        try {
+
+            List<SecDictionary> list = commonService.mappingSysNameOl(codeType);
+
+            List<JSONObject> objectList = new ArrayList<>();
+
+            for (SecDictionary dictionary : list) {
+                JSONObject object = new JSONObject();
+
+                Map<String, Object> map = new HashMap<>();
+                map.put("type" , 1);
+                map.put("sourceId" , id);
+                map.put("rechargePlatform" , dictionary.);
+                BsRechargeCode rechargeCode = bsRechargeCodeService.findByMap()
+            }
 
             return ResponseMsgUtil.success(RechargeConfig.getProductsListByLy());
 

hai-bweb/src/main/resources/pre/application.yml

@@ -9,7 +9,7 @@ debug: false
 #datasource数据源设置
 spring:
   datasource:
-    url: jdbc:mysql://139.159.177.244:3306/hsg_prod?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: HF123456.
     type: com.alibaba.druid.pool.DruidDataSource

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

@@ -506,6 +506,22 @@ public class HighOrderController {
         }
     }
 
+    @RequestMapping(value = "/orderCheck", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "根据订单id查看订单")
+    public ResponseData orderCheck(@RequestParam(name = "orderId", required = true) Long orderId) {
+        try {
+
+            highOrderService.orderCheck(orderId);
+
+            return ResponseMsgUtil.success("操作成功");
+
+        } catch (Exception e) {
+            log.error("HighOrderController --> cancelOrder() error!", e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
     @RequestMapping(value = "/cancelOrderByOrderNo", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "根据订单号 取消订单")

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

@@ -141,7 +141,7 @@ public class HighThirdPartyController {
             return ResponseMsgUtil.success(starbucksProductsList);
 
         } catch (Exception e) {
-            log.error("HighUserCardController --> oilCardRefund() error!", e);
+            log.error("HighUserCardController --> getStarbucksProducts() error!", e);
             return ResponseMsgUtil.exception(e);
         }
     }

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

@@ -29,9 +29,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 @Controller
 @RequestMapping(value = "/highUserCard")
@@ -325,20 +323,28 @@ public class HighUserCardController {
                                                   HttpServletRequest request) {
         try {
             // 用户
-//            SessionObject sessionObject = userCenter.getSessionObject(request);
-//            HighUserModel userInfoModel = (HighUserModel) sessionObject.getObject();
-//
-//            HighUserCard card = highUserCardService.getDetailByUserCardNo(userInfoModel.getHighUser().getId(), cardNo);
-//            if (card == null) {
-//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到数据");
-//            }
 
             JSONObject consumptionRecord = HuiLianTongUnionCardConfig.queryConsumptionRecordByBusiness(businessType, cardNo, sdate, edate, pageNum, pageSize);
             if (StringUtils.isBlank(consumptionRecord.getString("data"))) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQUEST_ERROR, "");
             }
+            JSONArray array = HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")).getJSONArray("records");
 
-            return ResponseMsgUtil.success(HuiLianTongUnionCardConfig.resolveResponse(consumptionRecord.getString("data")));
+            String s = "HFR";
+            String s1 = "AGAIN";
+
+            List<JSONObject> list = new ArrayList<>();
+
+
+            for (Object data : array) {
+                JSONObject dataObject = (JSONObject) data;
+                if (!StringUtils.contains(dataObject.getString("orderNo"),s) && !StringUtils.contains(dataObject.getString("orderNo"),s1)) {
+                    list.add(dataObject);
+                }
+
+            }
+
+            return ResponseMsgUtil.success(list);
 
         } catch (Exception e) {
             log.error("HighUserCardController --> getHuiLianTongCardConsume() error!", e);

hai-cweb/src/main/resources/pre/application.yml

@@ -9,7 +9,7 @@ debug: false
 #datasource数据源设置
 spring:
   datasource:
-    url: jdbc:mysql://139.159.177.244:3306/hsg_prod?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: HF123456.
     type: com.alibaba.druid.pool.DruidDataSource

hai-cweb/src/main/resources/pre/config.properties

@@ -18,6 +18,8 @@ wxGzSubMchId=1619676214
 HDAppId = 1614670195
 
 notifyUrl=https://hsgcs.dctpay.com/crest/wechatpay/notify
+imgUrl=https://hsgcs.dctpay.com/filesystem/
+
 
 fileUrl=/home/project/hsg/filesystem
 cmsPath=/home/project/hsg/filesystem/cmsPath

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

@@ -25,6 +25,7 @@ public class CommonSysConfig {
     private String shellPlatMerchantKey;
 
     private String qinzhuUrl;
+    private String qinzhuUrlToken;
     private String qinzhuHtmlUrl;
     private String qianzhuH5url;
     private String qinzhuMobileUrl; // 话费充值地址
@@ -197,6 +198,14 @@ public class CommonSysConfig {
         return qinzhuUrl;
     }
 
+    public String getQinzhuUrlToken() {
+        return qinzhuUrlToken;
+    }
+
+    public void setQinzhuUrlToken(String qinzhuUrlToken) {
+        this.qinzhuUrlToken = qinzhuUrlToken;
+    }
+
     public void setQinzhuUrl(String qinzhuUrl) {
         this.qinzhuUrl = qinzhuUrl;
     }

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

@@ -133,7 +133,7 @@ public class QianZhuConfig {
         map.put("traceId", WxUtils.makeNonStr());
         map.put("timestamp", new Date().getTime());
         map.put("sign", MD5Util.encode(generateSignature(map,CommonSysConst.getSysConfig().getQinzhuSecret()).getBytes()).toLowerCase());
-        return HttpsUtils.doPost("https://live.qianzhu8.com/gateway", JSON.toJSONString(map));
+        return HttpsUtils.doPost("", JSON.toJSONString(map));
     }
 
     /**
@@ -415,7 +415,7 @@ public class QianZhuConfig {
         map.put("traceId", WxUtils.makeNonStr());
         map.put("timestamp", new Date().getTime());
         map.put("sign", MD5Util.encode(generateSignature(map,CommonSysConst.getSysConfig().getQinzhuSecret()).getBytes()).toLowerCase());
-        return HttpsUtils.doPost("https://live-test.qianzhu8.com/gateway", JSON.toJSONString(map));
+        return HttpsUtils.doPost(CommonSysConst.getSysConfig().getQinzhuUrlToken(), JSON.toJSONString(map));
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.hai.entity;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * high_order
@@ -222,8 +223,7 @@ public class HighOrder implements Serializable {
 
     private String ext3;
 
-<<<<<<< HEAD
-=======
+
     private List<HighChildOrder> highChildOrderList;
 
     private HighDiscount highDiscount;
@@ -264,7 +264,6 @@ public class HighOrder implements Serializable {
         isTyAgent = tyAgent;
     }
 
->>>>>>> 2d52dbc7b84e73f0aec222be0e523218c95d9908
     private static final long serialVersionUID = 1L;
 
     public Long getId() {

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

@@ -11,6 +11,9 @@ public enum DiscountUseScope {
     type1(1 , "全场"),
     type2(2 , "卡券"),
     type3(3 , "话费"),
+    type4(4 , "肯德基"),
+    type5(5 , "星巴克"),
+    type6(6 , "会员充值"),
     ;
 
     private Integer type;

hai-service/src/main/java/com/hai/model/UserModel.java

@@ -20,6 +20,12 @@ public class UserModel {
     // 待支付数量
     private Integer unpaid;
 
+    // 待支付数量
+    private Long whetherCheckNum;
+
+    // 支付数量
+    private Integer orderPayNum;
+
     // 充值订单待支付数量
     private Integer  rechargeOrderNum;
 
@@ -125,4 +131,28 @@ public class UserModel {
     public void setRechargeOrderNum(Integer rechargeOrderNum) {
         this.rechargeOrderNum = rechargeOrderNum;
     }
+
+    public Integer getOrderPayNum() {
+        return orderPayNum;
+    }
+
+    public void setOrderPayNum(Integer orderPayNum) {
+        this.orderPayNum = orderPayNum;
+    }
+
+    public Boolean getSetOilCard() {
+        return isSetOilCard;
+    }
+
+    public void setSetOilCard(Boolean setOilCard) {
+        isSetOilCard = setOilCard;
+    }
+
+    public Long getWhetherCheckNum() {
+        return whetherCheckNum;
+    }
+
+    public void setWhetherCheckNum(Long whetherCheckNum) {
+        this.whetherCheckNum = whetherCheckNum;
+    }
 }

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

@@ -0,0 +1,57 @@
+package com.hai.service;
+
+import com.hai.entity.BsRechargeCode;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @serviceName BsRechargeCodeService.java
+ * @author Sum1Dream
+ * @version 1.0.0
+ * @Description // 充值编码接口
+ * @createTime 10:38 2022/7/20
+ **/
+public interface BsRechargeCodeService {
+
+    /**
+    * @Author Sum1Dream
+    * @name insertRechargeCode.java
+    * @Description // 新增充值编码
+    * @Date 10:39 2022/7/20
+    * @Param [com.hai.entity.BsRechargeCode] 
+    * @return void
+    */
+    void insertRechargeCode(BsRechargeCode rechargeCode);
+
+    /**
+    * @Author Sum1Dream
+    * @name updateRechargeCode.java
+    * @Description // 修改充值编码
+    * @Date 10:39 2022/7/20
+    * @Param [com.hai.entity.BsRechargeCode] 
+    * @return void
+    */
+    void updateRechargeCode(BsRechargeCode rechargeCode);
+
+    /**
+    * @Author Sum1Dream
+    * @name getListRechargeCode.java
+    * @Description //TODO
+    * @Date 10:40 2022/7/20
+    * @Param [java.util.Map<java.lang.String,java.lang.Object>] 
+    * @return java.util.List<com.hai.entity.BsRechargeCode>
+    */
+    List<BsRechargeCode> getListRechargeCode(Map<String, Object> map);
+
+    /**
+    * @Author Sum1Dream
+    * @name findByMap.java
+    * @Description // 查询详情
+    * @Date 13:58 2022/7/20
+    * @Param [java.util.Map<java.lang.String,java.lang.Object>]
+    * @return com.hai.entity.BsRechargeCode
+    */
+    BsRechargeCode findByMap(Map<String, Object> map);
+    
+}

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

@@ -223,6 +223,23 @@ public interface HighOrderService {
      **/
     Integer countOrderByUserId(Long memId , Integer status);
 
+    /**
+     * @Author 袁野
+     * @Description 根据用户查询订单统计
+     * @Date 2021/3/27 15:50
+     **/
+    Long whetherCheck(Long memId , Integer status);
+
+    /**
+    * @Author Sum1Dream
+    * @name orderCheck.java
+    * @Description // 订单查看
+    * @Date 14:46 2022/7/19
+    * @Param [java.lang.Long]
+    * @return void
+    */
+    void orderCheck(Long orderId);
+
     /**
      * @Author 袁野
      * @Description 未使用优惠券数量

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

@@ -0,0 +1,63 @@
+package com.hai.service.impl;
+
+import com.hai.dao.BsRechargeCodeMapper;
+import com.hai.entity.BsRechargeCode;
+import com.hai.entity.BsRechargeCodeExample;
+import com.hai.service.BsRechargeCodeService;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service("bsRechargeCodeService")
+public class BsRechargeCodeServiceImpl implements BsRechargeCodeService {
+
+
+   @Resource
+   private BsRechargeCodeMapper rechargeCodeMapper;
+
+    @Override
+    public void insertRechargeCode(BsRechargeCode rechargeCode) {
+        rechargeCodeMapper.insert(rechargeCode);
+    }
+
+    @Override
+    public void updateRechargeCode(BsRechargeCode rechargeCode) {
+        rechargeCodeMapper.updateByPrimaryKey(rechargeCode);
+    }
+
+    @Override
+    public List<BsRechargeCode> getListRechargeCode(Map<String, Object> map) {
+
+        BsRechargeCodeExample example = new BsRechargeCodeExample();
+        BsRechargeCodeExample.Criteria criteria = example.createCriteria();
+
+        return rechargeCodeMapper.selectByExample(example);
+    }
+
+    @Override
+    public BsRechargeCode findByMap(Map<String, Object> map) {
+        BsRechargeCodeExample example = new BsRechargeCodeExample();
+        BsRechargeCodeExample.Criteria criteria = example.createCriteria();
+
+        if (MapUtils.getInteger(map, "type") != null) {
+            criteria.andTypeEqualTo(MapUtils.getInteger(map, "type"));
+        }
+        if (MapUtils.getString(map, "sourceId") != null) {
+            criteria.andSourceIdEqualTo(MapUtils.getString(map, "SourceId"));
+        }
+        if (MapUtils.getInteger(map, "rechargePlatform") != null) {
+            criteria.andRechargePlatformEqualTo(MapUtils.getInteger(map, "rechargePlatform"));
+        }
+
+        List<BsRechargeCode> list = rechargeCodeMapper.selectByExample(example);
+
+        if (list.size() > 0) {
+            list.get(0);
+        }
+
+        return null;
+    }
+}

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

@@ -2059,8 +2059,10 @@ public class HighOrderServiceImpl implements HighOrderService {
             if (highDiscountUserRel == null || highDiscountUserRel.getStatus() != 1) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "优惠券状态错误");
             }
-            if (!highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type1.getType())
-                    && !highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type3.getType())) {
+            if (!highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type4.getType())
+                    && !highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type5.getType())
+                    && !highDiscountUserRel.getHighDiscount().getUseScope().equals(DiscountUseScope.type6.getType())
+            ) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法使用此优惠券");
             }
         }
@@ -2089,10 +2091,23 @@ public class HighOrderServiceImpl implements HighOrderService {
             // 卡卷类型  1：满减  2：抵扣   3：折扣
             if (highDiscountUserRel.getHighDiscount().getDiscountType() == 3) {
                 // 满减额度
-                discountPrice = orderPayPrice.multiply(highDiscountUserRel.getHighDiscount().getDiscountPrice());
+                discountPrice = orderPayPrice.subtract(orderPayPrice.multiply(highDiscountUserRel.getHighDiscount().getDiscountPrice())).setScale(2, RoundingMode.HALF_UP);
             }
         }
 
+        // 使用优惠券
+        if (highOrder.getMemDiscountId() != null) {
+            orderPayPrice = marketPrice;
+            HighDiscountUserRel discountUserRel = highDiscountUserRelService.getRelById(highOrder.getMemDiscountId());
+            discountUserRel.setUseTime(new Date()); // 使用时间
+            discountUserRel.setStatus(2);  //状态  0:已过期  1：未使用  2：已使用
+            highDiscountUserRelService.updateDiscountUserRel(discountUserRel);
+
+            HighDiscountAgentCode code = highDiscountAgentCodeService.getCodeById(discountUserRel.getDiscountAgentCodeId());
+            code.setStatus(3);
+            highDiscountAgentCodeService.updateCode(code);
+        }
+
         // 使用积分
         // 判断积分数量是否大于0
         if (object.getLong("integralNum") != null) {
@@ -2130,26 +2145,11 @@ public class HighOrderServiceImpl implements HighOrderService {
             }
         }
 
-        highOrder.setPayPrice(orderPayPrice);
         highOrder.setDeductionPrice(discountPrice);
         highOrder.setPayGold(object.getInteger("integralNum"));
 
-        // 使用优惠券
-        if (highOrder.getMemDiscountId() != null) {
-            highOrder.setTotalPrice(marketPrice);
-            highOrder.setPayPrice(marketPrice.subtract(discountPrice));
-            HighDiscountUserRel discountUserRel = highDiscountUserRelService.getRelById(highOrder.getMemDiscountId());
-            discountUserRel.setUseTime(new Date()); // 使用时间
-            discountUserRel.setStatus(2);  //状态  0:已过期  1：未使用  2：已使用
-            highDiscountUserRelService.updateDiscountUserRel(discountUserRel);
-
-            HighDiscountAgentCode code = highDiscountAgentCodeService.getCodeById(discountUserRel.getDiscountAgentCodeId());
-            code.setStatus(3);
-            highDiscountAgentCodeService.updateCode(code);
-        } else {
-            highOrder.setTotalPrice(orderPayPrice);
-            highOrder.setPayPrice(orderPayPrice.subtract(discountPrice));
-        }
+        highOrder.setTotalPrice(orderPayPrice);
+        highOrder.setPayPrice(orderPayPrice.subtract(discountPrice));
 
         if (integralPrice.compareTo(new BigDecimal(0)) > 0) {
             highOrder.setPayPrice(highOrder.getPayPrice().subtract(integralPrice));
@@ -2534,4 +2534,27 @@ public class HighOrderServiceImpl implements HighOrderService {
             updateOrder(order);
         }
     }
+
+    @Override
+    public Long whetherCheck(Long memId, Integer status) {
+
+        HighOrderExample example = new HighOrderExample();
+        HighOrderExample.Criteria criteria = example.createCriteria();
+
+        criteria.andMemIdEqualTo(memId).andOrderStatusEqualTo(status).andWhetherCheckEqualTo(false);
+
+        return highOrderMapper.countByExample(example);
+    }
+
+    @Override
+    public void orderCheck(Long orderId) {
+        HighOrder highOrder = highOrderMapper.selectByPrimaryKey(orderId);
+
+        highOrder.setWhetherCheck(true);
+
+        if  (highOrder.getOrderStatus() == 3) {
+            highOrderMapper.updateByPrimaryKey(highOrder);
+        }
+
+    }
 }

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

@@ -101,6 +101,8 @@ public class HighUserServiceImpl implements HighUserService {
         }
         user.setUnusedCouponNum(highUserCouponService.getCouponList(userId, 1).size()); //未使用卡卷数量
         user.setUnpaid(highOrderService.countOrderByUserId(userId , 1));
+        user.setOrderPayNum(highOrderService.countOrderByUserId(userId , 2));
+        user.setWhetherCheckNum(highOrderService.whetherCheck(userId , 3));
         user.setRechargeOrderNum(outRechargeOrderService.rechargeOrderNum(userId));
         user.setUnusedDiscount(highOrderService.countUnusedDiscountByUserId(userId , 1));
         user.setIsSetPayPwd(highUserPayPasswordService.isSetPayPwd(userId));

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

@@ -14,6 +14,7 @@ shellPlatMerchantKey=123
 
 # ????
 qinzhuUrl=https://live-test.qianzhu8.com
+qinzhuUrlToken=https://live-test.qianzhu8.com/gateway
 qinzhuHtmlUrl=https://m-test.qianzhu8.com
 qianzhuH5url=https://nf-test.qianzhu8.com/gateway
 qinzhuPlatformId=10376

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

@@ -11,11 +11,17 @@ tuanYouGasolineAccount=9hp52qf04400
 # tuanYouGasolineAccount=c2qitc984400
 
 qinzhuUrl=https://live.qianzhu8.com
+qinzhuUrlToken=https://live.qianzhu8.com/gateway
 qinzhuHtmlUrl=https://qz.dctpay.com
+qianzhuH5url=https://nf.qianzhu8.com/gateway
 qinzhuPlatformId=10458
 qinzhuSecret=nnl3gg4ss0pka11t
 qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify
 
+thirdAppKey=211395334
+thirdAppSecret=VxNTJua4FkmRVgIm8HgCSg==
+thirdPostUrl=http://mbsmemberclient.scyshy.com/
+
 huiliantongUrl=https://gzapi.deepermobile.com.cn
 huiliantongAppNo=guizhouhuilt
 huiliantongAppkey=e0ja2Ex%2BmQ2hIPF6x%2BHA%3D
@@ -49,16 +55,25 @@ TelApiSecret=d11ee9b41e014a039f030e53ae6f5295
 TelMemberId=d13091df65d64aafbf0f35d2093157b7
 
 // Mobile
-JjNotifyUrl = https://hsgcs.dctpay.com/crest/czOrder/rechargeCallbackByJj
+JjNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallbackByJj
 JjAppKey = p429mlj3cvn5hb07
 JjUrl = https://jj.dmjvip.com/index.php/third/mobile/
 JjAppSecret = bf57pnqy8mkexr0v169c3g4odazwu2ij
 
 #LY
-LyNotifyUrl = httpscs://hsg.dctpay.com/crest/czOrder/rechargeCallbackByLy
-LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU
-LyMemberId=18665
-LyPostUrl=https://cz.31994.cn/yrapi.php/
+LyNotifyUrl = https://hsg.dctpay.com/crest/czOrder/rechargeCallbackByLy
+#LyApiKey=CMdyxh2gJ7tbXc6rS0KADqPIfVpaQLjU
+##LyMemberId=18665
+##LyPostUrl=https://cz.31994.cn/yrapi.php/
+LyApiKey=UzMxo9SIL1tmFvWTwys7pQRGJqO3EChK
+LyMemberId=11236
+LyPostUrl=http://cz.zt10010.com/yrapi.php/
+
+
+#CY
+CyApiKey=cyMYLABWa2H2u
+CyAppSecret =cysslWXHnMHDMEvDEtwSWaJMGwl4dkcPLT
+CyPostUrl=http://120.24.83.85:8999/
 
 unionAppId=ced46392acfe42be863fdfdd3e61164a
 unionSecret=a0f380bb22cd4ce2a8d35f3bf437d6fa

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

@@ -11,6 +11,7 @@ tuanYouGasolineAccount=9hp52qf04400
 # tuanYouGasolineAccount=c2qitc984400
 
 qinzhuUrl=https://live.qianzhu8.com
+qinzhuUrlToken=https://live.qianzhu8.com/gateway
 qinzhuHtmlUrl=https://qz.dctpay.com
 qianzhuH5url=https://nf.qianzhu8.com/gateway
 qinzhuPlatformId=10458

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

@@ -11,15 +11,16 @@ tuanYouGasolineAccount=9hp52qf04400
 # tuanYouGasolineAccount=c2qitc984400
 
 qinzhuUrl=https://live.qianzhu8.com
+qinzhuUrlToken=https://live.qianzhu8.com/gateway
 qinzhuHtmlUrl=https://qz.dctpay.com
 qianzhuH5url=https://nf.qianzhu8.com/gateway
 qinzhuPlatformId=10458
 qinzhuSecret=nnl3gg4ss0pka11t
 qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify
 
-thirdAppKey=211394653
-thirdAppSecret=cyQpQKMaGUG186iEZRt1uQ==
-thirdPostUrl=http://mbsmemberwebapi.test.onfishes.com/
+thirdAppKey=211395334
+thirdAppSecret=VxNTJua4FkmRVgIm8HgCSg==
+thirdPostUrl=http://mbsmemberclient.scyshy.com/
 
 huiliantongUrl=https://gzapi.deepermobile.com.cn
 huiliantongAppNo=guizhouhuilt