From 04a2710347ef9a700f0bde53317283a96d408240 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Thu, 27 Jan 2022 11:15:06 +0800 Subject: [PATCH] fix --- .../smartadmin/module/system/royalcanin/MemberService.java | 2 +- .../module/system/royalcanin/TransitionController.java | 2 ++ .../module/system/royalcanin/good/OrderController.java | 3 +++ .../module/system/royalcanin/good/service/OrderService.java | 1 + .../lab1024/smartadmin/module/system/wxpay/WxpayService.java | 5 +++-- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index e449365b..60772a28 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java @@ -57,7 +57,7 @@ public class MemberService { JSONObject json = JSONObject.parseObject(jsonObjectResult.getString("data")); String id = json.getString("id"); jsonObjectResult.put("xaccessToken", SmartJWTUtil.generateToken(id)); - jsonObject.put("type","2"); + jsonObjectResult.put("type","2"); return jsonObjectResult.toJSONString(); }else { return jsonObjectResult.toJSONString(); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java index 32dba481..c43dbe15 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java @@ -117,6 +117,8 @@ public class TransitionController { } + + @ApiOperation(value = "会员地址", notes = "查询会员地址，添加会员地址，更新会员地址,删除会员地址") @PostMapping("royalcanin/memberAddress") public String transferMemberAddress(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 04f044c4..f54f7cfa 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.*; @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API}) @@ -269,6 +270,8 @@ public class OrderController { wxpayService.orderCallBack(request,response); } + + @ApiOperation(value = "监听微信回调", notes = "监听微信回调") @PostMapping(value = "royalcanin/monitorOrderNotify") public ResponseDTO monitorOrderNotify(@RequestParam String OrderNumber){ diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 2352ff36..7434a4fc 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -232,6 +232,7 @@ public class OrderService { OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber()); //新增支付方式paytype jsonObjectResult.put("paytype",orderEntity.getPayType()); + jsonObjectResult.put("basePoint",orderEntity.getBasePoint()); } //记录服务响应时间 diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java index 293e7d92..49b9d378 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java @@ -28,6 +28,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.net.Inet4Address; import java.net.InetAddress; +import java.net.URLEncoder; import java.util.*; @Service @@ -176,7 +177,7 @@ public class WxpayService { data.put("fee_type","CNY"); data.put("total_fee",getMoney(wxPayEntity.getTotal_fee())); data.put("spbill_create_ip", SmartIPUtil.getLocalHostIP()); - data.put("trade_type", "MWEB"); // 此处指定为扫码支付 + data.put("trade_type", "MWEB"); // 此处指定为H5支付 data.put("body","皇家宠物食品官方商城"); data.put("nonce_str", WXPayUtil.generateNonceStr()); data.put("product_id",wxPayEntity.getProduct_id()); @@ -190,7 +191,7 @@ public class WxpayService { if (returnCode.equals("SUCCESS")) { returnMap.put("ok", "200"); //拼接返回跳转地址 - String url= config.NOTIFY_URL_H5+"orderNumber="+wxPayEntity.getOut_trade_no() ; + String url= URLEncoder.encode(config.NOTIFY_URL_H5+"/myorder/usertion?orderNumber="+wxPayEntity.getOut_trade_no() + "&tradeType=MWEB","utf-8"); returnMap.put("url", response.get("mweb_url")+"&redirect_url="+url); return response.get("mweb_url") == null ? response.get("err_code_des"):returnMap.get("url"); } else {