Merge branch '2.0-dev' of http://gitea.dctpay.com/hurui/hai-server into 2.0-dev

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

@@ -86,15 +86,10 @@ public class HighThirdPartyController {
     @ResponseBody
     @ApiOperation(value = "查询星巴克商品")
     public ResponseData getStarbucksProducts(@RequestParam(name = "name", required = false) String name,
-                                             @RequestParam(value = "regionId", required = true) String regionId) {
+                                             @RequestParam(value = "companyId", required = true) Long companyId) {
         try {
 
-            SecRegion region = commonService.getParentByRegion(Long.valueOf(regionId));
+            BigDecimal productDiscount = thirdProductConfig.getProductConfigNum(1, companyId);;
-            BigDecimal productDiscount = null;
-            if (region != null) {
-                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
-                productDiscount = thirdProductConfig.getProductConfigNum(1, bsCompany.getId());
-            }
 
             if (productDiscount == null) {
                 log.error("getRechargeProduct error!", "查询失败！");
@@ -228,7 +223,7 @@ public class HighThirdPartyController {
     @RequestMapping(value = "/listByStoreCode", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询肯德基门店菜单")
-    public ResponseData listByStoreCode(@RequestParam(name = "storeCode", required = false) String storeCode, @RequestParam(value = "regionId", required = true) String regionId) {
+    public ResponseData listByStoreCode(@RequestParam(name = "storeCode", required = false) String storeCode, @RequestParam(value = "companyId", required = true) Long companyId) {
         try {
 
             JSONObject jsonObject = QianZhuConfig.listByStoreCode(storeCode);
@@ -240,12 +235,7 @@ public class HighThirdPartyController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未查询到任何门店");
             }
 
-            BigDecimal productDiscount = null;
+            BigDecimal productDiscount = thirdProductConfig.getProductConfigNum(2, companyId);
-            SecRegion region = commonService.getParentByRegion(Long.valueOf(regionId));
-            if (region != null) {
-                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
-                productDiscount = thirdProductConfig.getProductConfigNum(2, bsCompany.getId());
-            }
 
             if (productDiscount == null) {
                 log.error("getRechargeProduct error!", "查询失败！");
@@ -436,15 +426,10 @@ public class HighThirdPartyController {
     public ResponseData getMemberProducts(@RequestParam(name = "name", required = false) String name,
                                           @RequestParam(value = "typeId", required = true) Integer typeId,
                                           @RequestParam(value = "brandId", required = true) Integer brandId,
-                                             @RequestParam(value = "regionId", required = true) String regionId) {
+                                             @RequestParam(value = "companyId", required = true) Long companyId) {
         try {
 
-            SecRegion region = commonService.getParentByRegion(Long.valueOf(regionId));
+            BigDecimal productDiscount = thirdProductConfig.getProductConfigNum(3, companyId);
-            BigDecimal productDiscount = null;
-            if (region != null) {
-                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
-                productDiscount = thirdProductConfig.getProductConfigNum(3, bsCompany.getId());
-            }
 
             if (productDiscount == null) {
                 log.error("getRechargeProduct error!", "查询失败！");

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

@@ -36,13 +36,13 @@ jzPrivateKeyUrl=/home/project/hsg/fileKey/JzPrivateKey.key
 jzPublicKeyUrl=/home/project/hsg/fileKey/JzPublicKey.key
 
 # ????
-qinzhuUrl=https://live-test.qianzhu8.com
+qinzhuUrl=https://live.qianzhu8.com
-qinzhuUrlToken=https://live-test.qianzhu8.com/gateway
+qinzhuUrlToken=https://live.qianzhu8.com/gateway
-qinzhuHtmlUrl=https://m-test.qianzhu8.com
+qinzhuHtmlUrl=https://qz.dctpay.com
-qianzhuH5url=https://nf-test.qianzhu8.com/gateway
+qianzhuH5url=https://nf.qianzhu8.com/gateway
-qinzhuPlatformId=10376
+qinzhuPlatformId=10458
-qinzhuSecret=ktxb49sh2jfhgn8g
+qinzhuSecret=nnl3gg4ss0pka11t
-qianzhuOrderNotify=https://hsgcs.dctpay.com/crest/qianzhu/orderNotify
+qianzhuOrderNotify=https://hsg.dctpay.com/crest/qianzhu/orderNotify
 
 thirdAppKey=211394653
 thirdAppSecret=cyQpQKMaGUG186iEZRt1uQ==