From d25897a9e4a96079e3ef9d767083e631ead13a1c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 21 Jul 2021 16:23:51 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-core/src/main/java/com/xzx/gc/common/utils/wxpay/WxUtil.java | 4 +++-
gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java | 16 ++++++++++++++++
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/common/utils/wxpay/WxUtil.java b/gc-core/src/main/java/com/xzx/gc/common/utils/wxpay/WxUtil.java
index 750922b..14268ff 100644
--- a/gc-core/src/main/java/com/xzx/gc/common/utils/wxpay/WxUtil.java
+++ b/gc-core/src/main/java/com/xzx/gc/common/utils/wxpay/WxUtil.java
@@ -5,6 +5,7 @@
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONObject;
@@ -114,7 +115,8 @@
//是否需要透明底色，为 true 时，生成透明底色的小程序码
obj.put("is_hyaline", false);
try {
- InputStream inputStream = HttpRequest.post(url).body(obj.toString(), "application/json").execute().bodyStream();
+ HttpResponse execute = HttpRequest.post(url).body(obj.toString(), "application/json").execute();
+ InputStream inputStream = execute.bodyStream();
File file = new File(imgPath);
FileUtil.writeFromStream(inputStream, file);
long uploadUrl = FileUtil.size(file);
diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
index e45e802..7556b78 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
@@ -84,7 +84,7 @@
}
@ApiOperation("订单状态数量")
- @PostMapping(value = "/orderStatusCnt")
+ @PostMapping(value = "/jhy/order/orderStatusCnt")
public JsonResult<Map<Integer, Integer>> orderStatusCnt(HttpServletRequest request) {
return JsonResult.success(jhyOrderService.orderStatusCount(getUserId(request)));
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
index e6cc4ca..ac064d7 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java
@@ -22,6 +22,7 @@
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.common.utils.*;
import com.xzx.gc.common.utils.ali.SmsUtil;
+import com.xzx.gc.common.utils.wxpay.WxUtil;
import com.xzx.gc.entity.*;
import com.xzx.gc.model.IdDTO;
import com.xzx.gc.model.JsonResult;
@@ -119,6 +120,9 @@
@Autowired
private CityPartnerService cityPartnerService;
+
+ @Autowired
+ private WxUtil wxUtil;
/**
@@ -395,6 +399,18 @@
}
}
+ @ApiOperation(value = "获取二维码")
+ @PostMapping(value = "/user/share/acode")
+ public Result getAcode(HttpServletRequest request) {
+ Result result = new Result();
+ String userId = getUserId(request);
+ UserInfo userInfo = userMapper.selectByPrimaryKey(userId);
+ String imgName="/user_" + userId + "_acode_1.jpg";
+ String s = wxUtil.generateAcode("poster=" + userInfo.getMobilePhone() + "&chiefId=" + userInfo.getUserId(), "pages/login/login", imgName, "800px", 1);
+ result.setData(s);
+ return result;
+ }
+
@ApiOperation(value = "分页查看用户的分享提成详情")
@PostMapping(value = "/user/findPercentageDetail")
--
Gitblit v1.9.1