代码提交

无关风月

2024-11-26 5cf8494a6da08dfcdc5fdb4c5e55aefd8b27d684

 xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/client/ClientOrderController.java

@@ -11,6 +11,7 @@
import com.sun.corba.se.spi.ior.IdentifiableFactory;
import com.xinquan.common.core.constant.SecurityConstants;
import com.xinquan.common.core.domain.R;
import com.xinquan.common.core.utils.JuHeFuUtil;
import com.xinquan.common.core.utils.page.BeanUtils;
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
@@ -93,6 +94,17 @@
    private SysUserClient sysUserClient;
    @Autowired
    private TokenService tokenService;

    @ResponseBody
    @PostMapping("/queryPayment")
    @ApiOperation(value = "查询订单支付状态", tags = "查询订单支付状态")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", required = true),
    })
    public R<String> queryPayment(@RequestParam(value = "orderId") String orderId) throws Exception {
        JSONObject jsonObject = JuHeFuUtil.queryPayment(orderId);
        return R.ok(jsonObject.getString("status"));
    }
    @GetMapping("/getMeditationIsBuy/{id}/{meditationId}")
    public R<Integer> getMeditationIsBuy(@PathVariable("id")Long id,@PathVariable("meditationId")Long meditationId) {
        List<Order> list = orderService.lambdaQuery().eq(Order::getBusinessId, meditationId)
@@ -225,11 +237,13 @@
                    Course data4 = remoteCourseService.getCourseById(data.getBusinessId()).getData();
                    List<CourseChapter> data2 = remoteCourseService.getChapterByCourseId(orderCourseVO.getBusinessId() + "").getData();
                    int temp = 0 ;
                    int b = 0 ;
                    for (CourseChapter courseChapter : data2) {
                        temp+=courseChapter.getVirtualLearnedNum();
                        Long data9 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
                        b+=data9;
                    }
                    Integer data3 = remoteCourseService.getCountByCourseId(orderCourseVO.getBusinessId() + "").getData();
                    orderCourseVO.setCount(data3+temp);
                    orderCourseVO.setCount(b+temp);
                    if (data4!=null){
                        orderCourseVO.setCourseTitle(data4.getCourseTitle());
                        orderCourseVO.setCoverUrl(data4.getCoverUrl());
@@ -302,10 +316,12 @@
     * @return 下单返回数据视图对象
     * @see com.xinquan.order.domain.vo.ClientPlaceOrderVO
     */
  
    @PostMapping("/placeOrder")
    @ApiOperation(value = "创建支付订单", notes = "微信|支付宝")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "targetId", value = "目标id 订单类型为会员和充值时不传", dataType = "Long", required = false),
            @ApiImplicitParam(name = "type", value = "类型 用于判断苹果支付还是安卓支付", dataType = "Long", required = false),
            @ApiImplicitParam(name = "orderId", value = "订单id 待支付时传", dataType = "Long", required = false),
            @ApiImplicitParam(name = "orderFrom", value = "订单来源 1=冥想音频 2=课程 3=购买会员 4充值", dataType = "Integer", required = true),
            @ApiImplicitParam(name = "receiverId", value = "被赠送课程APP用户id", dataType = "Long", required = false),
@@ -316,6 +332,7 @@
    })
    public R<ClientPlaceOrderVO> placeOrder(
            @RequestParam(value = "targetId", required = false) Long targetId,
            @RequestParam(value = "type", required = false) Integer type,
            @RequestParam(value = "orderId", required = false) Long orderId,
            @RequestParam(value = "orderFrom") Integer orderFrom,
            @RequestParam(value = "receiverId", required = false) Long receiverId,
@@ -323,12 +340,14 @@
            @RequestParam(value = "payType") Integer payType,
            @RequestParam(value = "amount", required = false) BigDecimal amount,
            @RequestParam(value = "vipType", required = false) Integer vipType)

    {
        try {

            ClientPlaceOrderVO clientPlaceOrderVO = orderService.placeOrder(targetId, orderFrom, receiverId, orderId,
                    balanceFlag, payType, amount, vipType,type);
            System.err.println("支付返回参数"+clientPlaceOrderVO);
            return R.ok(
                    orderService.placeOrder(targetId, orderFrom, receiverId,orderId,
                            balanceFlag, payType,amount,vipType));
                    clientPlaceOrderVO);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
@@ -343,11 +362,16 @@
    public R refund(@RequestParam(value = "uid") String uid,
                    @RequestParam(value = "remark") String remark) throws Exception {
        Order byId = orderService.getById(uid);
        String refund = orderService.refund(Long.valueOf(uid));
        if (refund!=null && (!refund.equals("success"))){
            return  R.fail(refund);
        }
        byId.setRefundStatus(2);
        byId.setRefundRemark(remark);
        byId.setPaymentStatus(3);
        byId.setRefundTime(LocalDateTime.now());
        orderService.updateById(byId);
        orderService.refund(Long.valueOf(uid));

        return R.ok();
    }
    @ResponseBody
@@ -490,7 +514,7 @@
//                    if (data1.getProportion() != null) {
//
//                        BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
//                                .setScale(2, BigDecimal.ROUND_HALF_DOWN);
//                                .setScale(2, BigDecimal.ROUND_DOWN);
//                        // 上级获取的分佣金额
//                        AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
//                        // 更新用户余额
@@ -551,7 +575,7 @@
                // 支付金额
                String string3 = jsonObject1.getString("pay_fee");
                Order one = orderService.lambdaQuery().eq(Order::getBizOrderNo, string).one();
                if (one.getPaymentStatus()==2){
                if (one.getPaymentStatus()!=1){
                    return;
                }
                one.setPaymentStatus(2);
@@ -560,8 +584,7 @@
                        .ne(OrderPaymentRecord::getPaymentType, 4).one();
                if (one2!=null){
                    one2.setPaymentStatus(2);
                    // 扣除用户余额
                    Object data = remoteAppUserService.deleteBalance(one.getAppUserId() + "", one2.getPayAmount() + "").getData();
                    one2.setPayOrderNo(string2);
                    orderPaymentRecordService.updateById(one2);
                }
                // 实际支付金额
@@ -585,7 +608,7 @@
                        if (data1.getProportion() != null) {

                            BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
                                    .setScale(2, BigDecimal.ROUND_HALF_DOWN);
                                    .setScale(2, BigDecimal.ROUND_DOWN);
                            // 上级获取的分佣金额
                            AppUser appUserById = remoteAppUserService.getAppUserById(data.getInviteUserId() + "").getData();
                            // 更新用户余额
@@ -696,7 +719,7 @@
            e.printStackTrace();
        }
    }
    private static final String AES_KEY = "cb0a181ac97395c6942be19315fc0727";
    private static final String AES_KEY = "6d548eb01bad44bbbb4a23743e733103";
    public static String decrypt(String strToDecrypt) {
        try {
            SecretKeySpec secretKey = new SecretKeySpec(AES_KEY.getBytes(), "AES");
@@ -782,7 +805,7 @@
                            if (data1.getProportion() != null) {

                                BigDecimal bigDecimal = one1.getPayAmount().multiply(data1.getProportion()).divide(new BigDecimal("100"))
                                        .setScale(2, BigDecimal.ROUND_HALF_DOWN);
                                        .setScale(2, BigDecimal.ROUND_DOWN);
                                // 上级获取的分佣金额
                                AppUser appUserById = remoteAppUserService.getAppUserById(data9.getInviteUserId() + "").getData();
                                // 更新用户余额
@@ -998,22 +1021,29 @@
            OrderPaymentRecord two = orderPaymentRecordService.lambdaQuery()
                    .eq(OrderPaymentRecord::getOrderId, orderId)
                    .ne(OrderPaymentRecord::getPaymentType, 4)
                    .eq(OrderPaymentRecord::getPaymentStatus, 2).one();
                    .ne(OrderPaymentRecord::getPaymentStatus, 1).one();
            OrderPaymentRecord three = orderPaymentRecordService.lambdaQuery()
                    .eq(OrderPaymentRecord::getOrderId, orderId)
                    .eq(OrderPaymentRecord::getPaymentType, 4)
                    .ne(OrderPaymentRecord::getPaymentStatus, 1).one();
            if (two==null){
                one.setRemark("余额支付");
                one.setBalance(one.getTotalAmount());
            }else{
                switch (two.getPaymentType()){
                    case 1:
                        one.setRemark("微信支付");
                switch (one.getPayType()){
                    case 5:
                        one.setRemark("微信支付+余额");
                        break;
                    case 2:
                        one.setRemark("支付宝支付");
                    case 6:
                        one.setRemark("支付宝支付+余额");
                        break;
                    case 3:
                        one.setRemark("苹果内购");
                    case 7:
                        one.setRemark("苹果内购+余额");
                }
                one.setPayOrderNo(two.getPayOrderNo());
                if (three!=null){
                    one.setBalance(three.getPayAmount());
                }
            }
            if (one.getCommissionId()!=null){
                switch (one.getOrderFrom()){