Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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
@@ -168,7 +166,7 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
 
         //付款请求
         BaseResult<Payment> paymentResBaseResult = paymentClient.executePayment(payment);
-        log.info("关单返回: {}", JSONObject.toJSONString(paymentResBaseResult));
+        log.info("付款返回: {}", JSONObject.toJSONString(paymentResBaseResult));
         if (paymentResBaseResult.getStatus()) {
             orderPayRes.setPay_amt(detail.getActualPrice().setScale(2, RoundingMode.HALF_UP).toString());
             String pay_info = paymentResBaseResult.getData().getPayInfo();

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);

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/core/service/impl/SysConfigPaymentServiceImpl.java

@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.annotation.PostConstruct;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 
 @Service
@@ -32,7 +33,7 @@ public class SysConfigPaymentServiceImpl extends ServiceImpl<SysConfigPaymentDao
     private void init() {
         List<SysConfigPayment> sysConfigPayments = baseMapper.selectList(Wrappers.emptyWrapper());
         for (SysConfigPayment configPayment : sysConfigPayments) {
-            redissonClient.getBucket(REDIS_KEY + ":" + configPayment.getOpenType() + ":" + configPayment.getParamName()).set(configPayment);
+            redissonClient.getBucket(REDIS_KEY + ":" + configPayment.getOpenType() + ":" + configPayment.getParamName()).set(configPayment, 30, TimeUnit.MINUTES);
         }
     }
 
@@ -57,7 +58,7 @@ public class SysConfigPaymentServiceImpl extends ServiceImpl<SysConfigPaymentDao
                     .eq(SysConfigPayment::getClient, platform)
                     .eq(SysConfigPayment::getParamName, paramName)
             );
-            redissonClient.getBucket(REDIS_KEY + ":" + openType.getCode() + ":" + platform + ":" + paramName).set(configPayment);
+            redissonClient.getBucket(REDIS_KEY + ":" + openType.getCode() + ":" + platform + ":" + paramName).set(configPayment, 30, TimeUnit.MINUTES);
         }
         return configPayment;
     }