Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MemberPriceSettingsServiceImpl.java

@@ -63,6 +63,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         }
         OrderCreateRes orderCreateRes = new OrderCreateRes();
         orderCreateRes.setRes(true);
+        orderCreateRes.setMerchId(0l);
         orderCreateRes.setBizId(detail.getId());
         orderCreateRes.setBizContent("会员卡购买-" + detail.getPeriod().getMsg());
         orderCreateRes.setGoodNum(1);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PianoRoomBuyRecordServiceImpl.java

@@ -50,6 +50,7 @@ public class PianoRoomBuyRecordServiceImpl extends ServiceImpl<PianoRoomBuyRecor
         }
         OrderCreateRes orderCreateRes = new OrderCreateRes();
         orderCreateRes.setRes(true);
+        orderCreateRes.setMerchId(0l);
         orderCreateRes.setBizId(detail.getId());
         orderCreateRes.setBizContent("琴房时长包购买-" + detail.getTimes() + "分");
         orderCreateRes.setGoodNum(1);

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/PaymentController.java

@@ -55,39 +55,14 @@ import java.util.concurrent.TimeUnit;
 @RequestMapping("/payment")
 @Api(value = "付款接口", tags = "付款接口")
 public class PaymentController extends BaseController {
-    private final static Logger log = LoggerFactory.getLogger(PaymentController.class);
-    @Autowired
-    private UserOrderPaymentService paymentService;
-    @Autowired
-    private UserOrderRefundService userOrderRefundService;
+
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
-    private UserOrderService userOrderService;
-    @Autowired
     private PaymentClient paymentClient;
     @Autowired
-    private RedissonClient redissonClient;
-    @Autowired
     private PaymentProperties paymentProperties;
 
-    @ApiOperation(value = "查询付款单")
-    @GetMapping("/queryPayment")
-    public HttpResponseResult<Payment> queryPayment(String paymentNo) {
-        UserOrderPayment userOrderPayment = paymentService.getOne(Wrappers.<UserOrderPayment>lambdaQuery()
-                .eq(UserOrderPayment::getPaymentNo, paymentNo)
-        );
-        if (null == userOrderPayment) {
-            return HttpResponseResult.succeed();
-        }
-        Payment param = new Payment(userOrderPayment.getOpenType(),
-                PaymentClientEnum.valueOf(userOrderPayment.getPaymentClient()), userOrderPayment.getPayChannel());
-        param.setId(userOrderPayment.getTransNo());
-        param.setPaymentNo(userOrderPayment.getPaymentNo());
-        BaseResult<Payment> paymentBaseResult = paymentClient.queryPayment(param);
-        return HttpResponseResult.status(paymentBaseResult);
-    }
-
     @ApiOperation(value = "通过用户给的授权码获取三方支付授权信息")
     @GetMapping("/getOpenId")
     public HttpResponseResult<Map<String, Object>> getOpenId(OpenAuth openAuth) {
@@ -100,74 +75,4 @@ public class PaymentController extends BaseController {
         BaseResult<Map<String, Object>> res = paymentClient.getOpenAuthMsg(openAuth);
         return HttpResponseResult.status(res);
     }
-
-    /***
-     * 支付回调
-     * @author liweifan
-     * @param: request
-     * @updateTime 2022/3/11 18:35
-     */
-    @PostMapping("/callback/{openType}/{client}/{payChannel}/{payMethod}")
-    public Object callback(
-            @PathVariable("openType") String openType,
-            @PathVariable("client") String client,
-            @PathVariable("payChannel") String payChannel,
-            @PathVariable("payMethod") String payMethod,
-            HttpServletRequest request
-    ) {
-        log.info("支付回调：openType is {} ,paymentClient is {}，payChannel is {}，payMethod is {}", openType, client, payChannel, payMethod);
-        BaseResult<PaymentCallBack> res = paymentClient.analysisNotice(
-                OpenEnum.valueOf(openType), PaymentClientEnum.valueOf(client),
-                PayChannelEnum.valueOf(payChannel), MethodNameEnum.valueOf(payMethod), request);
-        if (res.getStatus()) {
-            PaymentCallBack data = res.getData();
-            //查询到订单
-            UserOrderVo userOrderVo = userOrderService.getUserOrderByPaymentNoOrTransNo(data.getPaymentNo(), data.getId());
-            if (null == userOrderVo) {
-                return res.getData().getResMsg();
-            }
-            try {
-                DistributedLock.of(redissonClient)
-                        .runIfLockCanGet(CacheNameEnum.LOCK_EXECUTE_ORDER.getRedisKey(userOrderVo.getUserId())
-                                , () -> {
-                                    if (MethodNameEnum.executePayment.equals(data.getMethodName())) {
-                                        //支付交易
-                                        paymentService.executePaymentCallBack(data);
-                                    } else if (MethodNameEnum.closePayment.equals(data.getMethodName())) {
-                                        //关闭订单
-                                        paymentService.closePaymentCallBack(data);
-                                    } else if (MethodNameEnum.refundPayment.equals(data.getMethodName())) {
-                                        //退款
-                                        userOrderRefundService.refundPaymentCallBack(data);
-                                    }
-                                }, 60L, TimeUnit.SECONDS);
-            } catch (BizException e) {
-                log.error("回调业务异常，msg is {}", e.getMessage());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        return res.getData().getResMsg();
-    }
-
-
-    /***
-     * 支付回调
-     * @author liweifan
-     * @param: request
-     * @updateTime 2022/3/11 18:35
-     */
-    @PostMapping("/testCallback")
-    public void testCallback(@RequestBody PaymentCallBack data) {
-        if (MethodNameEnum.executePayment.equals(data.getMethodName())) {
-            //支付交易
-            paymentService.executePaymentCallBack(data);
-        } else if (MethodNameEnum.closePayment.equals(data.getMethodName())) {
-            //关闭订单
-            paymentService.closePaymentCallBack(data);
-        } else if (MethodNameEnum.refundPayment.equals(data.getMethodName())) {
-            //退款
-            userOrderRefundService.refundPaymentCallBack(data);
-        }
-    }
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/UserOrderController.java

@@ -96,7 +96,7 @@ public class UserOrderController extends BaseController {
         if (StringUtil.isEmpty(payReq.getOrderNo())) {
             return failed("订单号不能为空");
         }
-        payReq.setPaymentClient(PaymentClientEnum.STUDENT);
+        payReq.setPaymentClient(PaymentClientEnum.TEACHER);
         payReq.setUserId(user.getId());
         payReq.setIpAddress(WebUtil.getRemoteIp(request));
 
@@ -117,33 +117,6 @@ public class UserOrderController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "通过业务id查询用户正在交易中的订单")
-    @PostMapping("/getPendingOrder")
-    @ApiImplicitParams({
-            @ApiImplicitParam(
-                    name = "goodType",
-                    value = "订单类型:  PRACTICE、陪练课购买  LIVE、直播课购买 VIDEO、视频课购买 MUSIC、单曲点播",
-                    paramType = "query", dataType = "String", required = true
-            ),
-            @ApiImplicitParam(
-                    name = "bizId",
-                    value = "业务id 直播课、陪练课购买为课程组id；陪练课为老师id；单曲点播传曲子id",
-                    paramType = "query", dataType = "Long"
-            )
-    })
-    public HttpResponseResult<UserOrderVo> getPendingOrder(@ApiIgnore @RequestBody OrderSearch query) {
-        if (null == query.getGoodType()
-                || (!GoodTypeEnum.VIP.equals(query.getGoodType()) && null == query.getBizId())) {
-            return HttpResponseResult.failed("参数异常");
-        }
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        query.setUserId(user.getId());
-        return userOrderService.getPendingOrder(query);
-    }
-
     @ApiOperation(value = "取消订单")
     @PostMapping("/orderCancel")
     @ApiImplicitParams({

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/wx/OriginalWxAppTemplate.java

@@ -112,7 +112,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
             return BaseResult.succeed(payment);
         } catch (WxPayException e) {
             log.error("微信APP支付请求失败:{}", e.toString());
-            return BaseResult.failed(e.getReturnMsg());
+            return BaseResult.failed(e.toString());
         } catch (Exception e) {
             e.printStackTrace();
             return BaseResult.failed("微信APP支付请求失败");
@@ -148,7 +148,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
             return BaseResult.succeed(payment);
         } catch (WxPayException e) {
             log.error("微信APP支付查询请求失败:{}", e.toString());
-            return BaseResult.failed(e.getReturnMsg());
+            return BaseResult.failed(e.toString());
         } catch (Exception e) {
             e.printStackTrace();
             return BaseResult.failed("微信APP支付查询请求失败");
@@ -174,7 +174,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
             return BaseResult.succeed(closePayment);
         } catch (WxPayException e) {
             log.error("微信APP支付关单请求失败:{}", e.toString());
-            return BaseResult.failed(e.getReturnMsg());
+            return BaseResult.failed(e.toString());
         } catch (Exception e) {
             e.printStackTrace();
             return BaseResult.failed("微信APP支付关单请求失败");
@@ -214,7 +214,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
             return BaseResult.succeed(refundBill);
         } catch (WxPayException e) {
             log.error("微信APP支付请求失败:{}", e.toString());
-            return BaseResult.failed(e.getReturnMsg());
+            return BaseResult.failed(e.toString());
         } catch (Exception e) {
             e.printStackTrace();
             return BaseResult.failed("微信APP支付关单请求失败");
@@ -306,7 +306,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
             resMsg.put("message", "失败");
             paymentCallBack.setResMsg(resMsg);
             log.error("微信回调对象转换失败, param is {} , err is {}", params, e.toString());
-            return BaseResult.failed(HttpStatus.INTERNAL_SERVER_ERROR, paymentCallBack, "微信回调对象转换失败");
+            return BaseResult.failed(HttpStatus.INTERNAL_SERVER_ERROR, paymentCallBack, e.toString());
         } catch (Exception e) {
             e.printStackTrace();
             resMsg.put("code", "FAIL");