支付回调修改

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.biz.dal.dto.req.OrderPayReq;
+import com.yonge.cooleshow.biz.dal.entity.UserOrderRefundBill;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.UserOrderService;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
@@ -58,13 +59,10 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
 
     @Override
     public UserOrderPayment detailByTransNoOrPaymentNo(String transNo, String paymentNo) {
-        if (!StringUtil.isEmpty(transNo)) {
-            return baseMapper.selectOne(Wrappers.<UserOrderPayment>lambdaQuery()
-                    .eq(UserOrderPayment::getTransNo, transNo));
-        } else {
-            return baseMapper.selectOne(Wrappers.<UserOrderPayment>lambdaQuery()
-                    .eq(UserOrderPayment::getPaymentNo, paymentNo));
-        }
+        return baseMapper.selectOne(Wrappers.<UserOrderPayment>lambdaQuery().and(
+                wrapper -> wrapper.eq(UserOrderPayment::getTransNo, transNo)
+                        .or().eq(UserOrderPayment::getPaymentNo, paymentNo)
+        ));
     }
 
     @Override

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

@@ -173,7 +173,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
 
     @Override
     public UserOrderVo getUserOrderByPaymentNoOrTransNo(String paymentNo, String transNo) {
-        return baseMapper.getUserOrderByPaymentNoOrTransNo(paymentNo,transNo);
+        return baseMapper.getUserOrderByPaymentNoOrTransNo(paymentNo, transNo);
     }
 
     @Override
@@ -187,7 +187,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                 && !OrderStatusEnum.PAYING.equals(detail.getStatus())) {
             return HttpResponseResult.failed("订单已关闭");
         }
-        orderPaymentService.closePaymentAndReqOpen(payReq.getOrderNo(),"用户取消订单");
+        orderPaymentService.closePaymentAndReqOpen(payReq.getOrderNo(), "用户取消订单");
         //关闭订单
         doOrderCancel(detail, OrderStatusEnum.CLOSE, StringUtil.isEmpty(payReq.getReason()) ? "用户取消订单" : payReq.getReason());
         return HttpResponseResult.succeed(true);
@@ -610,6 +610,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                 UserOrderPayment orderPayment = orderPaymentService
                         .detailByTransNoOrPaymentNo(data.getId(), data.getPaymentNo());
                 if (null != orderPayment) {
+                    orderPayment.setTransNo(data.getId());
                     orderPayment.setStatus(TradeStatusEnum.succeeded);
                     orderPayment.setArrivalTime(now);
                     orderPayment.setUpdateTime(now);