xiaoyong931011
2021-07-21 d25897a9e4a96079e3ef9d767083e631ead13a1c
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
3 files modified
22 ■■■■■ changed files
gc-core/src/main/java/com/xzx/gc/common/utils/wxpay/WxUtil.java 4 ●●● patch | view | raw | blame | history
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java 2 ●●● patch | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java 16 ●●●●● patch | view | raw | blame | history
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);
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)));
    }
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")