Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

无关风月

1 天以前 8a5b6dedd18a0956ffa8da7ec9ace30b1d8238fc

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -3,16 +3,13 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.api.R;
import com.dsh.account.dto.BindDto;
import com.dsh.account.dto.IntroduceUserQuery;
import com.dsh.account.dto.SelectDto;
import com.dsh.account.dto.UpdateInfoDto;
import com.dsh.account.entity.IntroduceUser;
import com.dsh.account.entity.TAppGift;
import com.dsh.account.entity.TAppUser;
import com.dsh.account.entity.TCourseInfoRecord;
import com.dsh.account.entity.TStudent;
import com.dsh.account.entity.UserIntegralChanges;
import com.dsh.account.entity.*;
import com.dsh.account.feignclient.other.VipClient;
import com.dsh.account.model.AddAppUserVo;
import com.dsh.account.model.AdvertisementChangeStateDTO;
import com.dsh.account.model.AppUserByNameAndPhoneDTO;
@@ -35,6 +32,7 @@
import com.dsh.account.util.TokenUtil;
import com.dsh.account.util.ToolUtil;
import com.dsh.account.util.wx.WxV3PayConfig;
import com.dsh.account.vo.VipPaymentVO;
import com.wechat.pay.contrib.apache.httpclient.util.AesUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -69,6 +67,8 @@

    @Autowired
    private TAppUserService appUserService;
    @Autowired
    private VipClient vipClient;

    @Autowired
    private PayMoneyUtil payMoneyUtil;
@@ -439,9 +439,10 @@
    @ApiOperation(value = "购买年度会员", tags = {"APP-成为会员"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "支付方式（1=微信，2=支付宝）", name = "payType", dataType = "int", required = true),
            @ApiImplicitParam(value = "会员卡id", name = "id", dataType = "int", required = true),
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil addVipPayment(Integer payType) {
    public ResultUtil addVipPayment(Integer payType,Integer id) {
        if (ToolUtil.isEmpty(payType)) {
            return ResultUtil.paranErr("payType");
        }
@@ -450,59 +451,84 @@
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
            return vipPaymentService.addVipPayment(uid, payType);
            return vipPaymentService.addVipPayment(uid, payType, id);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


    /**
     * 购买年度会员支付微信回调V3版本回调
     *
     * @param request
     * @param response
     */
    @ResponseBody
    @PostMapping("/base/appUser/addVipPaymentWeChatCallback1")
    public void addVipPaymentWeChatCallback1(HttpServletRequest request, HttpServletResponse response) {
        try {
            System.err.println("微信回调");
            System.err.println("请求" + request);
            BufferedReader reader = request.getReader();
            String string1 = reader.toString();
            System.err.println("请求reader" + string1);
            StringBuilder requestBody = new StringBuilder();
            String line;
            while ((line = reader.readLine()) != null) {
                requestBody.append(line);
            }
            System.err.println("全部请求体" + requestBody);
            JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
            JSONObject resource = jsonObject.getJSONObject("resource");
    @PostMapping("/api/appUser/vipPayment")
    @ApiOperation(value = "页面数据展示", tags = {"APP-成为会员"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<VipPaymentVO> vipPayment() {

            AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
            String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
                    resource.getString("ciphertext"));
            System.err.println("微信解密的字符串信息" + decryptedData);
            JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
            String out_trade_no = jsonInfo.getString("out_trade_no");
            String transaction_id = jsonInfo.getString("transaction_id");
            String trade_state = jsonInfo.getString("trade_state");
            if (trade_state.equals("SUCCESS")) {
                ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, transaction_id);
                if (resultUtil.getCode() == 200) {
                    PrintWriter out = response.getWriter();
                    out.write("SUCCESS");
                    out.flush();
                    out.close();
                }
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if (null == uid) {
                return ResultUtil.tokenErr();
            }
            TAppUser appUser = appUserService.getById(uid);
            VipPaymentVO res = new VipPaymentVO();
            res.setHeadImg(appUser.getHeadImg());
            res.setName(appUser.getName());
            res.setIsVip(appUser.getIsVip());
            List<Vip> vips = vipClient.listAll();
            res.setVipList(vips);
        } catch (Exception e) {
            e.printStackTrace();
            return ResultUtil.runErr();
        }
        return ResultUtil.success();
    }
//
//    /**
//     * 购买年度会员支付微信回调V3版本回调
//     *
//     * @param request
//     * @param response
//     */
//    @ResponseBody
//    @PostMapping("/base/appUser/addVipPaymentWeChatCallback1")
//    public void addVipPaymentWeChatCallback1(HttpServletRequest request, HttpServletResponse response) {
//        try {
//            System.err.println("微信回调");
//            System.err.println("请求" + request);
//            BufferedReader reader = request.getReader();
//            String string1 = reader.toString();
//            System.err.println("请求reader" + string1);
//            StringBuilder requestBody = new StringBuilder();
//            String line;
//            while ((line = reader.readLine()) != null) {
//                requestBody.append(line);
//            }
//            System.err.println("全部请求体" + requestBody);
//            JSONObject jsonObject = JSONObject.parseObject(requestBody.toString());
//            JSONObject resource = jsonObject.getJSONObject("resource");
//
//            AesUtil aesUtil = new AesUtil(WxV3PayConfig.apiV3Key.getBytes(StandardCharsets.UTF_8));
//            String decryptedData = aesUtil.decryptToString(resource.getString("associated_data").getBytes(StandardCharsets.UTF_8), resource.getString("nonce").getBytes(StandardCharsets.UTF_8),
//                    resource.getString("ciphertext"));
//            System.err.println("微信解密的字符串信息" + decryptedData);
//            JSONObject jsonInfo = (JSONObject) JSONObject.parse(decryptedData);
//            String out_trade_no = jsonInfo.getString("out_trade_no");
//            String transaction_id = jsonInfo.getString("transaction_id");
//            String trade_state = jsonInfo.getString("trade_state");
//            if (trade_state.equals("SUCCESS")) {
//                ResultUtil resultUtil = vipPaymentService.addVipPaymentCallback(out_trade_no, transaction_id);
//                if (resultUtil.getCode() == 200) {
//                    PrintWriter out = response.getWriter();
//                    out.write("SUCCESS");
//                    out.flush();
//                    out.close();
//                }
//            }
//        } catch (Exception e) {
//            e.printStackTrace();
//        }
//    }
    /**
     * 购买年度会员支付微信回调
     *