‘linchangsheng’ 6 bulan lalu
induk
melakukan
18109dcfca

+ 18 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -246,6 +246,24 @@ public class UserController {
         return ResponseHelper.success(adminWebsitApplyBeans);
     }
 
+
+/*    @GetMapping("/apply/websit")
+    @ApiOperation("入驻的网点列表")
+    public ResponseHelper<List<AdminWebsitApplyBean>> applyWebsitList(
+            @ApiParam(value = "是否查询所有可入驻网点(不包含入驻网点)",required = false) @RequestParam(required = false) Boolean isAll,
+            @ApiParam(value = "是否为增置服务网点",required = false) @RequestParam(required = false) Boolean isIncre,
+            @ApiParam(value = "(WAIT=入驻待审核 WAIT_WORKER 待师傅购买  POLICY_WAIT 保险待审核  OK=通过 FAIL=驳回EXPIRED 证件快过期  OVERDUE 证件已过期 STOP 暂停 QUIT 已离职)",required = false)
+            @RequestParam(required = false) List<String> examineStatus,
+            @ApiParam(value = "增值服务ID",required = false) @RequestParam(required = false) String increId,
+            @ApiParam(value = "经度",required = false) @RequestParam(required = false) String lng,
+            @ApiParam(value = "纬度",required = false) @RequestParam(required = false) String lat,
+            @ApiParam(value = "单位米,距离",required = false) @RequestParam(required = false) Integer rice,
+            @ApiParam(value = "网点名称",required = false) @RequestParam(required = false) String websitName
+    ){
+        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(rice,websitName,isAll,increId,isIncre,lng,lat,examineStatus);
+        return ResponseHelper.success(adminWebsitApplyBeans);
+    }*/
+
     @PostMapping("/default/websit")
     @ApiOperation(value = "设置默认网点")
     public ResponseHelper defaultWebsit(

+ 1 - 1
mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -1250,7 +1250,7 @@ public class WechatLogic {
             log.info("商户扫码支付生成订单响应: {}", payResult);
         } catch (WxPayException e) {
             log.error("商户扫码支付失败: {}", payResult);
-            throw new RemoteServiceException("扫码支付失败,请检查二维码是否正确"+payResult.getErrCodeDes());
+            throw new RemoteServiceException("扫码支付失败,请刷新二维码,再次尝试扫码");
         }
         if (payResult == null || WxPayConstants.ResultCode.FAIL.equals(payResult.getReturnCode())) {