Merge remote-tracking branch 'origin/master'

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/dao/PortalOrderDao.java

@@ -37,4 +37,5 @@ public interface PortalOrderDao {
      */
     int releaseSkuStockLock(@Param("itemList") List<OmsOrderItem> orderItemList);
 
+    int releaseProductStockLock(@Param("itemList") List<OmsOrderItem> orderItemList);
 }

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/OmsPortalOrderService.java

@@ -105,6 +105,7 @@ public interface OmsPortalOrderService {
      *
      * @param data
      */
+    @Transactional
     void closePaymentCallBack(PaymentCallBack data);
 
 

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/UserOrderPaymentService.java

@@ -4,6 +4,7 @@ import com.yonge.cooleshow.mbg.model.UserOrderPayment;
 import com.yonge.toolset.payment.base.enums.PayChannelEnum;
 import com.yonge.toolset.payment.base.enums.TradeStatusEnum;
 import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -28,8 +29,10 @@ public interface UserOrderPaymentService {
      *
      * @param userOrderPayment
      */
+    @Transactional
     void save(UserOrderPayment userOrderPayment);
 
+    @Transactional
     void saveOrUpdate(UserOrderPayment userOrderPayment);
 
     UserOrderPayment getByOrderNo(String orderSn, PayChannelEnum payChannel, TradeStatusEnum pending);
@@ -48,6 +51,7 @@ public interface UserOrderPaymentService {
      * @param message 信息
      * @param data
      */
+    @Transactional
     void closePayment(String orderSn, String message, PaymentCallBack data);
 
     /**

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -3,14 +3,7 @@ package com.yonge.cooleshow.portal.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.portal.dao.PortalProductDao;
-import com.yonge.cooleshow.portal.dto.OrderPayReq;
-import com.yonge.cooleshow.portal.dto.OrderPayRes;
-import com.yonge.toolset.base.exception.BizException;
-
 import com.yonge.cooleshow.mall.common.api.CommonPage;
 import com.yonge.cooleshow.mall.common.exception.Asserts;
 import com.yonge.cooleshow.mall.common.service.RedisService;
@@ -19,15 +12,16 @@ import com.yonge.cooleshow.mbg.model.*;
 import com.yonge.cooleshow.portal.component.CancelOrderSender;
 import com.yonge.cooleshow.portal.dao.PortalOrderDao;
 import com.yonge.cooleshow.portal.dao.PortalOrderItemDao;
-import com.yonge.cooleshow.portal.dao.SmsCouponHistoryDao;
+import com.yonge.cooleshow.portal.dao.PortalProductDao;
 import com.yonge.cooleshow.portal.domain.*;
+import com.yonge.cooleshow.portal.dto.OrderPayReq;
+import com.yonge.cooleshow.portal.dto.OrderPayRes;
 import com.yonge.cooleshow.portal.service.*;
-import com.yonge.toolset.payment.base.enums.PaymentClientEnum;
-import com.yonge.toolset.utils.string.StringUtil;
-
+import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.result.BaseResult;
 import com.yonge.toolset.payment.base.enums.OpenEnum;
 import com.yonge.toolset.payment.base.enums.PayChannelEnum;
+import com.yonge.toolset.payment.base.enums.PaymentClientEnum;
 import com.yonge.toolset.payment.base.enums.TradeStatusEnum;
 import com.yonge.toolset.payment.base.model.DeviceInfo;
 import com.yonge.toolset.payment.base.model.DivMember;
@@ -36,7 +30,7 @@ import com.yonge.toolset.payment.base.model.Payment;
 import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
 import com.yonge.toolset.payment.core.props.PaymentProperties;
 import com.yonge.toolset.payment.core.service.PaymentClient;
-
+import com.yonge.toolset.utils.string.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +51,7 @@ import java.util.stream.Collectors;
 @Service
 public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
 
-    private static final Logger log = LoggerFactory.getLogger(OmsPortalOrderService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OmsPortalOrderServiceImpl.class);
     @Autowired
     private UmsMemberService memberService;
     @Autowired
@@ -70,8 +64,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     private UmsIntegrationConsumeSettingMapper integrationConsumeSettingMapper;
     @Autowired
     private PmsSkuStockMapper skuStockMapper;
-    @Autowired
-    private SmsCouponHistoryDao couponHistoryDao;
+
     @Autowired
     private OmsOrderMapper orderMapper;
     @Autowired
@@ -375,6 +368,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             //解除订单商品库存锁定
             if (!CollectionUtils.isEmpty(orderItemList)) {
                 portalOrderDao.releaseSkuStockLock(orderItemList);
+                portalOrderDao.releaseProductStockLock(orderItemList);
             }
             //修改优惠券使用状态
             updateCouponStatus(cancelOrder.getCouponId(), cancelOrder.getMemberId(), 0);
@@ -393,7 +387,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     public void sendDelayMessageCancelOrder(Long orderId) {
         //获取订单超时时间
         OmsOrderSetting orderSetting = orderSettingMapper.selectByPrimaryKey(1L);
-        long delayTimes = orderSetting.getNormalOrderOvertime() * 60 * 1000;
+        long delayTimes = orderSetting.getNormalOrderOvertime() * 60 * 1000L;
         //发送延迟消息
         cancelOrderSender.sendMessage(orderId, delayTimes);
     }
@@ -542,12 +536,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         payment.setOrderDesc("酷乐秀商城订单编号-" + detail.getOrderSn());
 
         //封装订单详情
-        List<OrderDetil> orderDetils = new ArrayList<>();
+        List<OrderDetil> orderDetails = new ArrayList<>();
         for (OmsOrderItem orderDetailVo : detail.getOrderItemList()) {
-            orderDetils.add(new OrderDetil(orderDetailVo.getId().toString(), orderDetailVo.getProductName(),
+            orderDetails.add(new OrderDetil(orderDetailVo.getId().toString(), orderDetailVo.getProductName(),
                     orderDetailVo.getProductQuantity(), orderDetailVo.getRealAmount().toString()));
         }
-        payment.setOrderDetils(orderDetils);
+        payment.setOrderDetils(orderDetails);
         payment.setPayAmt(detail.getPayAmount().setScale(2, RoundingMode.HALF_UP).toString());
         payment.setDescription(payReq.getReason());
 
@@ -660,14 +654,15 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         //订单完成
         UserOrderPayment userOrderPayment = userOrderPaymentService.getByAdapayNo(data.getPaymentNo());
         if (null == userOrderPayment) {
-            log.error("汇付支付回调，订单未找到。 req is {}", JSON.toJSONString(data));
+            String string = JSON.toJSONString(data);
+            LOG.error("汇付支付回调，订单未找到。 req is {}", string);
             return;
         }
         OmsOrderDetail detail = detail(userOrderPayment.getOrderNo());
         if (detail.getStatus() == 0) {
             orderSuccess(detail, data,data.getId());
         } else {
-            log.error("汇付支付回调，订单状态异常。 req is {}", detail.getOrderSn());
+            LOG.error("汇付支付回调，订单状态异常。 req is {}", detail.getOrderSn());
         }
     }
 
@@ -680,21 +675,22 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     private void paymentFailedHandle(PaymentCallBack data) {
         //订单完成
         UserOrderPayment userOrderPayment = userOrderPaymentService.getByAdapayNo(data.getPaymentNo());
+        String dataString = JSON.toJSONString(data);
         if (null == userOrderPayment) {
-            log.error("汇付支付回调，订单未找到。 req is {}", JSON.toJSONString(data));
+            LOG.error("汇付支付回调，订单未找到。 req is {}", dataString);
             return;
         }
 
         OmsOrderDetail detail = detail(userOrderPayment.getOrderNo());
         if (null == detail) {
-            log.error("汇付支付回调，订单未找到。 req is {}", JSON.toJSONString(data));
+            LOG.error("汇付支付回调，订单未找到。 req is {}", dataString);
             return;
         }
         if (detail.getStatus() == 0) {
 
             cancelOrder(detail.getId(), data.getErrMsg(),data);
         } else {
-            log.error("汇付支付回调，订单状态异常。 req is {}", JSON.toJSONString(data));
+            LOG.error("汇付支付回调，订单状态异常。 req is {}", dataString);
         }
     }
 
@@ -738,12 +734,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
     /***
      * 处理支付中订单
      */
-    @Transactional(rollbackFor = Exception.class)
     void payingOrderHandle(OmsOrder userOrder) {
         //判断汇付订单状态
         UserOrderPayment orderPayment = userOrderPaymentService.getByOrderNoAndStatusPaying(userOrder.getOrderSn());
         if (null == orderPayment) {
             cancelOrder(userOrder.getId(), "支付超时", null);
+            return;
         }
         OmsOrderDetail detail = detail(orderPayment.getOrderNo());
         try {
@@ -753,7 +749,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             param.setPaymentNo(orderPayment.getAdapayNo());
             BaseResult<Payment> res = paymentClient.queryPayment(param);
             //支付成功
-            if (res.getStatus() && TradeStatusEnum.succeeded.getCode().equals(res.getData().getStatus())
+            if (res.getStatus() && TradeStatusEnum.succeeded.getCode().equals(res.getData().getStatus().getCode())
                     && (detail.getStatus() == 0 || detail.getStatus() == 1)
             ) {
                 orderSuccess(detail,res.getData().getId());
@@ -767,7 +763,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             cancelOrder(userOrder.getId(), "支付超时", null);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("轮询处理支付中订单异常，异常参数: {}", JSONObject.toJSONString(userOrder));
+            LOG.error("轮询处理支付中订单异常，异常参数: {}", JSON.toJSONString(userOrder));
         }
     }
 
@@ -783,12 +779,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
      * @updateTime 2022/4/13 17:17
      */
     @Transactional(rollbackFor = Exception.class)
-    void orderSuccess(OmsOrder detail, PaymentCallBack data, String tranId) {
+    public void orderSuccess(OmsOrder detail, PaymentCallBack data, String tranId) {
         //更新订单
         UserOrderPayment orderPayment = userOrderPaymentService.getByOrderNoAndStatusPaying(detail.getOrderSn());
 
         if (orderPayment == null) {
-            log.error("支付回调，支付中订单未找到。 orderNo is {}",detail.getOrderSn());
+            LOG.error("支付回调，支付中订单未找到。 orderNo is {}", detail.getOrderSn());
             return;
         }
         if (data != null) {
@@ -814,7 +810,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                 orderPayment.setFeeAmt(new BigDecimal(data.getExecutePaymentCallBack().getFeeAmt()));
             } catch (Exception e) {
                 e.printStackTrace();
-                log.error("完成订单，付款单金额格式化失败,参数{}", JSON.toJSONString(data));
+                LOG.error("完成订单，付款单金额格式化失败,参数{}", JSON.toJSONString(data));
             }
         }
         userOrderPaymentService.saveOrUpdate(orderPayment);
@@ -856,7 +852,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
      * 计算该订单赠送的成长值
      */
     private Integer calcGiftGrowth(List<OmsOrderItem> orderItemList) {
-        Integer sum = 0;
+        int sum = 0;
         for (OmsOrderItem orderItem : orderItemList) {
             sum = sum + orderItem.getGiftGrowth() * orderItem.getProductQuantity();
         }
@@ -928,12 +924,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
      */
     private BigDecimal calcPayAmount(OmsOrder order) {
         //总金额+运费-促销优惠-优惠券优惠-积分抵扣
-        BigDecimal payAmount = order.getTotalAmount()
-                .add(order.getFreightAmount())
-                .subtract(order.getPromotionAmount())
-                .subtract(order.getCouponAmount())
-                .subtract(order.getIntegrationAmount());
-        return payAmount;
+        return order.getTotalAmount()
+                    .add(order.getFreightAmount())
+                    .subtract(order.getPromotionAmount())
+                    .subtract(order.getCouponAmount())
+                    .subtract(order.getIntegrationAmount());
     }
 
     /**

cooleshow-mall/mall-portal/src/main/resources/config/mybatis/PortalOrderDao.xml

@@ -92,4 +92,19 @@
             #{item.productSkuId}
         </foreach>
     </update>
+
+    <update id="releaseProductStockLock">
+        UPDATE pms_product
+        SET
+        lock_stock = CASE id
+        <foreach collection="itemList" item="item">
+            WHEN #{item.productId} THEN lock_stock - #{item.productQuantity}
+        </foreach>
+        END
+        WHERE
+        id IN
+        <foreach collection="itemList" item="item" separator="," open="(" close=")">
+            #{item.productId}
+        </foreach>
+    </update>
 </mapper>

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

@@ -326,6 +326,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean del(Long id) {
 
         MusicSheet musicSheet = super.getById(id);
@@ -347,6 +348,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveMusicSheet(MusicSheetDto musicSheetDto,Long userId) {
 
         if (musicSheetDto.getId() != null) {
@@ -590,6 +592,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void importExcel(List<ExcelDataReaderProperty<MusicSheetExport>> dataList, Long userId) {
 
         List<ErrMsg> errMsgList = new ArrayList<>();
@@ -597,7 +600,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         List<MusicSheetDto> musicSheetDtoList = new ArrayList<>();
         List<MusicTagVo> musicTagVoList = musicTagService.selectMusicTagTree();
         List<Subject> subjects = subjectService.subjectSelect();
-
+        Date date = new Date();
         for (ExcelDataReaderProperty<MusicSheetExport> readerProperty : dataList) {
             MusicSheetDto musicSheetDto = new MusicSheetDto();
             musicSheetDto.setUserId(userId);
@@ -609,11 +612,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             musicSheetDto.setDelFlag(false);
             musicSheetDto.setCreateBy(userId);
             musicSheetDto.setUpdateBy(userId);
-            musicSheetDto.setCreateTime(new Date());
-            musicSheetDto.setUpdateTime(new Date());
-            if(AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {
-                musicSheetDto.setMp3Type(null);
-            }
+            musicSheetDto.setCreateTime(date);
+            musicSheetDto.setUpdateTime(date);
+
             String errMsg = readerProperty.getErrorMessage();
             if (!StringUtil.isEmpty(errMsg)) {
                 errMsgList.add(new ErrMsg(readerProperty.getRowIndex(), errMsg));
@@ -622,6 +623,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             MusicSheetExport sheetExport = readerProperty.getClazz();
             BeanUtils.copyProperties(sheetExport,musicSheetDto);
 
+            if(AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {
+                musicSheetDto.setMp3Type(null);
+            }
+
             if (musicSheetDto.getAudioType().equals(AudioTypeEnum.MP3)) {
                 musicSheetDto.setUrl(musicSheetDto.getMidiUrl());
                 musicSheetDto.setMidiUrl("");

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
@@ -103,6 +101,7 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
 
             try {
                 BaseResult<ClosePayment> responseResult = paymentClient.closePayment(param);
+                log.info("关单返回: {}", JSONObject.toJSONString(responseResult));
                 if (!responseResult.getStatus()) {
                     orderPayment.setCloseStatus(TradeStatusEnum.failed);
                     orderPayment.setCloseFailMsg(responseResult.getMsg());
@@ -167,6 +166,7 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
 
         //付款请求
         BaseResult<Payment> paymentResBaseResult = paymentClient.executePayment(payment);
+        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/UserOrderRefundServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -32,6 +33,8 @@ import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
 import com.yonge.toolset.payment.base.model.callback.RefundPaymentCallBack;
 import com.yonge.toolset.payment.core.service.PaymentClient;
 import com.yonge.toolset.utils.string.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,6 +48,8 @@ import java.util.stream.Collectors;
 
 @Service
 public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao, UserOrderRefund> implements UserOrderRefundService {
+    private final static Logger log = LoggerFactory.getLogger(UserOrderRefundServiceImpl.class);
+
     @Autowired
     private UserOrderService orderService;
     @Autowired
@@ -306,7 +311,7 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
         refundBill.setReason(orderRefund.getReason());
 
         BaseResult<RefundBill> refundBillBaseResult = paymentClient.refundPayment(refundBill);
-
+        log.info("退款返回: {} ", JSONObject.toJSONString(refundBillBaseResult));
         //入退款单表
         UserOrderRefundBill orderRefundBill = new UserOrderRefundBill();
         orderRefundBill.setRefundId(orderRefund.getId());
@@ -320,8 +325,6 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
             orderRefundBill.setPayFailMsg(refundBillBaseResult.getMsg());
         }
         refundBillService.save(orderRefundBill);
-
-
         return HttpResponseResult.succeed(orderRefundBill);
     }
 

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

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/core/util/SpringBeansUtil.java

@@ -44,10 +44,6 @@ public class SpringBeansUtil implements ApplicationContextAware {
 
      /** 通过name获取 Bean. */
     public static Object getBean(String name){
-        String[] beanDefinitionNames = getApplicationContext().getBeanDefinitionNames();
-        for (String beanDefinitionName : beanDefinitionNames) {
-            System.out.println(beanDefinitionName);
-        }
         if(!getApplicationContext().containsBean(name)){
             return null;
         }

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/OriginalAliAppTemplate.java

@@ -90,6 +90,8 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
         request.setBizContent(bizContent.toString());
         try {
             AlipayTradeAppPayResponse response = getAlipayClient(payment.getPaymentClient()).sdkExecute(request);
+            log.info("支付返回：{}", JSONObject.toJSONString(response));
+
             if (response.isSuccess()) {
                 payment.setId(response.getTradeNo());
                 payment.setPayInfo(response.getBody());
@@ -117,6 +119,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
         request.setBizContent(bizContent.toString());
         try {
             AlipayTradeQueryResponse response = getAlipayClient(payment.getPaymentClient()).execute(request);
+            log.info("查询返回：{}", JSONObject.toJSONString(response));
 
             if (response.isSuccess()) {
                 payment.setPayAmt(response.getPayAmount());
@@ -158,6 +161,8 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
         request.setBizContent(bizContent.toString());
         try {
             AlipayTradeCloseResponse response = getAlipayClient(closePayment.getPaymentClient()).execute(request);
+            log.info("关单返回：{}", JSONObject.toJSONString(response));
+
             closePayment.setStatus(TradeStatusEnum.succeeded);
             if (response.isSuccess()) {
                 return BaseResult.succeed(closePayment);
@@ -187,6 +192,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
         request.setBizContent(bizContent.toString());
         try {
             AlipayTradeRefundResponse response = getAlipayClient(refundBill.getPaymentClient()).execute(request);
+            log.info("退款返回：{}", JSONObject.toJSONString(response));
 
             if (response.isSuccess()) {
                 //获取交易状态

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

@@ -92,6 +92,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
         try {
             Object orderV3 = getWxPayService(payment.getPaymentClient())
                     .createOrderV3(TradeTypeEnum.APP, request);
+            log.info("支付返回：{}", JSONObject.toJSONString(orderV3));
             Map<String, String> stringStringMap = SignUtils.xmlBean2Map(orderV3);
             String msg = buildMessage(
                     APP_ID,
@@ -133,6 +134,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
         try {
             WxPayOrderQueryV3Result res = getWxPayService(payment.getPaymentClient())
                     .queryOrderV3(param);
+            log.info("查询返回：{}", JSONObject.toJSONString(res));
 
             payment.setId(res.getTransactionId());
             String tradeState = res.getTradeState();
@@ -208,6 +210,7 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
         try {
             WxPayRefundV3Result res = getWxPayService(refundBill.getPaymentClient())
                     .refundV3(param);
+            log.info("退款返回：{}", JSONObject.toJSONString(res));
 
             String refund_id = res.getRefundId();
             refundBill.setId(refund_id);

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

@@ -9,6 +9,7 @@ import com.yonge.toolset.payment.core.service.SysConfigPaymentService;
 import com.yonge.toolset.payment.original.wx.constant.WxpayConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,6 +24,8 @@ import java.security.PrivateKey;
 public class WxpayConfiguration {
     @Autowired
     private SysConfigPaymentService configPaymentService;
+    @Value("${spring.profiles.active}")
+    private String profile;
 
     @Bean(name = "studentWxService")
     public WxPayService studentWxService() {
@@ -44,8 +47,14 @@ public class WxpayConfiguration {
         payConfig.setMchKey(merchantPrivateKey);
         payConfig.setCertSerialNo(merchantSerialNumber);
         payConfig.setApiV3Key(apiV3Key);
-        payConfig.setPrivateCertPath(privateCertPath);
-        payConfig.setPrivateKeyPath(privateKeyPath);
+        if("local".equals(profile)){
+            payConfig.setPrivateCertPath("D:\\env\\license\\wxpay\\apiclient_cert.pem");
+            payConfig.setPrivateKeyPath("D:\\env\\license\\wxpay\\apiclient_key.pem");
+        }else{
+            payConfig.setPrivateCertPath(privateCertPath);
+            payConfig.setPrivateKeyPath(privateKeyPath);
+        }
+
         // 可以指定是否使用沙箱环境
         payConfig.setUseSandboxEnv(false);
 
@@ -75,8 +84,14 @@ public class WxpayConfiguration {
         payConfig.setMchKey(merchantPrivateKey);
         payConfig.setCertSerialNo(merchantSerialNumber);
         payConfig.setApiV3Key(apiV3Key);
-        payConfig.setPrivateCertPath(privateCertPath);
-        payConfig.setPrivateKeyPath(privateKeyPath);
+
+        if("local".equals(profile)){
+            payConfig.setPrivateCertPath("D:\\env\\license\\wxpay\\apiclient_cert.pem");
+            payConfig.setPrivateKeyPath("D:\\env\\license\\wxpay\\apiclient_key.pem");
+        }else{
+            payConfig.setPrivateCertPath(privateCertPath);
+            payConfig.setPrivateKeyPath(privateKeyPath);
+        }
         // 可以指定是否使用沙箱环境
         payConfig.setUseSandboxEnv(false);