xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-03 10:46:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Carl 2022-01-27 11:15:06 +08:00
parent 59b505dd8f
commit 04a2710347
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java
View File

@ -57,7 +57,7 @@ public class MemberService {
JSONObject json = JSONObject.parseObject(jsonObjectResult.getString("data")); JSONObject json = JSONObject.parseObject(jsonObjectResult.getString("data"));
String id = json.getString("id"); String id = json.getString("id");
jsonObjectResult.put("xaccessToken", SmartJWTUtil.generateToken(id)); jsonObjectResult.put("xaccessToken", SmartJWTUtil.generateToken(id));
jsonObject.put("type","2"); jsonObjectResult.put("type","2");
return jsonObjectResult.toJSONString(); return jsonObjectResult.toJSONString();
}else { }else {
return jsonObjectResult.toJSONString(); return jsonObjectResult.toJSONString();

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java
View File

@ -117,6 +117,8 @@ public class TransitionController {
} }
@ApiOperation(value = "会员地址", notes = "查询会员地址，添加会员地址，更新会员地址,删除会员地址") @ApiOperation(value = "会员地址", notes = "查询会员地址，添加会员地址，更新会员地址,删除会员地址")
@PostMapping("royalcanin/memberAddress") @PostMapping("royalcanin/memberAddress")
public String transferMemberAddress(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception { public String transferMemberAddress(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception {

3
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
View File

@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*; import java.util.*;
@Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API}) @Api(tags = {SwaggerTagConst.Admin.MANAGER_MALL_API})
@ -269,6 +270,8 @@ public class OrderController {
wxpayService.orderCallBack(request,response); wxpayService.orderCallBack(request,response);
} }
@ApiOperation(value = "监听微信回调", notes = "监听微信回调") @ApiOperation(value = "监听微信回调", notes = "监听微信回调")
@PostMapping(value = "royalcanin/monitorOrderNotify") @PostMapping(value = "royalcanin/monitorOrderNotify")
public ResponseDTO<String> monitorOrderNotify(@RequestParam String OrderNumber){ public ResponseDTO<String> monitorOrderNotify(@RequestParam String OrderNumber){

1
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java
View File

@ -232,6 +232,7 @@ public class OrderService {
OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber()); OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber());
//新增支付方式paytype //新增支付方式paytype
jsonObjectResult.put("paytype",orderEntity.getPayType()); jsonObjectResult.put("paytype",orderEntity.getPayType());
jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
} }
//记录服务响应时间 //记录服务响应时间

5
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
View File

@ -28,6 +28,7 @@ import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.Inet4Address; import java.net.Inet4Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.URLEncoder;
import java.util.*; import java.util.*;
@Service @Service
@ -176,7 +177,7 @@ public class WxpayService {
data.put("fee_type","CNY"); data.put("fee_type","CNY");
data.put("total_fee",getMoney(wxPayEntity.getTotal_fee())); data.put("total_fee",getMoney(wxPayEntity.getTotal_fee()));
data.put("spbill_create_ip", SmartIPUtil.getLocalHostIP()); data.put("spbill_create_ip", SmartIPUtil.getLocalHostIP());
data.put("trade_type", "MWEB"); // 此处指定为扫码支付 data.put("trade_type", "MWEB"); // 此处指定为H5支付
data.put("body","皇家宠物食品官方商城"); data.put("body","皇家宠物食品官方商城");
data.put("nonce_str", WXPayUtil.generateNonceStr()); data.put("nonce_str", WXPayUtil.generateNonceStr());
data.put("product_id",wxPayEntity.getProduct_id()); data.put("product_id",wxPayEntity.getProduct_id());
@ -190,7 +191,7 @@ public class WxpayService {
if (returnCode.equals("SUCCESS")) { if (returnCode.equals("SUCCESS")) {
returnMap.put("ok", "200"); 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); returnMap.put("url", response.get("mweb_url")+"&redirect_url="+url);
return response.get("mweb_url") == null ? response.get("err_code_des"):returnMap.get("url"); return response.get("mweb_url") == null ? response.get("err_code_des"):returnMap.get("url");
} else { } else {