'提交代码'

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

@@ -68,7 +68,7 @@ public class HighCouponCodeController {
     }
 
 
-    @RequestMapping(value="/useCouponCode",method = RequestMethod.GET)
+    @RequestMapping(value="/useCouponCode",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "使用卡卷码")
     public ResponseData useCouponCode(@RequestBody String reqBody, HttpServletRequest request) {

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

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

hai-bweb/src/main/resources/prod/config.properties

@@ -1,2 +1,2 @@
-fileUrl=F:/hurui_probject/filesystem
-cmsPath=F:/hurui_probject/filesystem
+fileUrl=/home/project/hsg/filesystem
+cmsPath=/home/project/hsg/filesystem/cmsPath

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

@@ -105,7 +105,7 @@ public class HighCouponController {
 
     @RequestMapping(value = "/getUserCouponList", method = RequestMethod.GET)
     @ResponseBody
-    @ApiOperation(value = "获取用户卡卷")
+    @ApiOperation(value = "获取用户卡卷列表")
     public ResponseData getUserCouponList(@RequestParam(name = "status", required = false) Integer status,
                                           @RequestParam(name = "pageNum", required = true) Integer pageNum,
                                           @RequestParam(name = "pageSize", required = true) Integer pageSize,

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

@@ -15,5 +15,3 @@ notifyUrl=https://hsgcs.dctpay.com/crest/wechatpay/notify
 fileUrl=/home/project/hsg/filesystem
 cmsPath=/home/project/hsg/filesystem/cmsPath
 couponCodePath=/home/project/hsg/filesystem/couponCode
-
-ss=HfkjWxPayHaiShengGuang0123456789

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

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

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

@@ -1,5 +1,17 @@
-wxAppId=wx01898d5209357d68
-wxAppSecret=5c52d0526fcdb425075f6d51381d5c03
+#   ΢ÐÅÅäÖÃ
+wxAppId=wx8d49e2f83025229d
+wxAppSecret=d8d6dcaef77d3b659258a01b5ddba5df
 
-fileUrl=F:/hurui_probject/filesystem
-cmsPath=F:/hurui_probject/filesystem
+
+wxApiKey=Skufk5oi85wDFGl888i6wsRSTkdd5df5
+wxMchAppId=wx637bd6f7314daa46
+wxMchId=1289663601
+wxSubAppId=wx8d49e2f83025229d
+wxSubMchId=1603942866
+wxUnifiedOrderUrl=https://api.mch.weixin.qq.com/pay/unifiedorder
+
+notifyUrl=https://hsg.dctpay.com/crest/wechatpay/notify
+
+fileUrl=/home/project/hsg/filesystem
+cmsPath=/home/project/hsg/filesystem/cmsPath
+couponCodePath=/home/project/hsg/filesystem/couponCode

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

@@ -37,7 +37,7 @@ public class HighGoldRecServiceImpl implements HighGoldRecService {
         }
 
         if (MapUtils.getLong(map, "goldType") != null) {
-            criteria.andUserIdEqualTo(MapUtils.getLong(map, "goldType"));
+            criteria.andGoldTypeEqualTo(MapUtils.getLong(map, "goldType"));
         }
 
         example.setOrderByClause("create_time desc");