Merge branch 'dev_v1_1_20220720'

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

@@ -118,7 +118,6 @@ public interface UserOrderService extends IService<UserOrder> {
      * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
      */
     HttpResponseResult<Boolean> orderCancel(OrderPayReq payReq);
-
     /***
      * 取消订单（未判断付款单状态）
      * @author liweifan

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

@@ -727,35 +727,31 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         detail.setUpdateTime(now);
         updateById(detail);
 
-        try {
-            if (null != data) {
-                //更新付款单
-                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);
-
-                    if (null != data.getExecutePaymentCallBack()) {
-                        orderPayment.setBackPayAmt(
-                                new BigDecimal(data.getExecutePaymentCallBack().getPayAmt()));
-
-                        BigDecimal feeAmt = new BigDecimal(data.getExecutePaymentCallBack().getFeeAmt());
-                        if (BigDecimal.ZERO.compareTo(feeAmt) == 0) {
-                            orderPayment.setFeeAmt(orderPayment.getPayAmt().subtract(orderPayment.getBackPayAmt()));
-                        } else {
-                            orderPayment.setFeeAmt(feeAmt);
-                        }
+        if (null != data) {
+            //更新付款单
+            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);
+
+                if (null != data.getExecutePaymentCallBack()) {
+                    orderPayment.setBackPayAmt(
+                            new BigDecimal(data.getExecutePaymentCallBack().getPayAmt()));
+
+                    BigDecimal feeAmt = new BigDecimal(data.getExecutePaymentCallBack().getFeeAmt());
+                    if (BigDecimal.ZERO.compareTo(feeAmt) == 0) {
+                        orderPayment.setFeeAmt(orderPayment.getPayAmt().subtract(orderPayment.getBackPayAmt()));
+                    } else {
+                        orderPayment.setFeeAmt(feeAmt);
                     }
-                    orderPaymentService.updateById(orderPayment);
                 }
+                orderPaymentService.updateById(orderPayment);
             }
-        } catch (Exception e) {
-            log.error("订单完成-更新付款单失败, UserOrderVo is {},PaymentCallBack is {}", JSONObject.toJSONString(detail), JSONObject.toJSONString(data));
-            e.printStackTrace();
         }
+
         //调用业务
         List<UserOrderDetailVo> orderDetailList = orderDetailService.getOrderDetilListByOrderNo(detail.getOrderNo());
 
@@ -789,7 +785,8 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
      *
      * @param orderDetailVo
      */
-    private void savePlatformAccountRecord(UserOrderDetailVo orderDetailVo) {
+    @Transactional(rollbackFor = Exception.class)
+    public void savePlatformAccountRecord(UserOrderDetailVo orderDetailVo) {
         BigDecimal expectPrice = orderDetailVo.getExpectPrice();
         if (expectPrice.compareTo(BigDecimal.ZERO) <= 0) {
             return;

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserAccountMapper.xml

@@ -83,7 +83,7 @@
             (select sum(a.trans_amount_) from user_cash_account_record a where a.account_id_ = t.user_id_
                 and a.post_status_ = 'RECORDED' and a.in_or_out_ = 'IN') as amountRecorded,
             (select sum(a.trans_amount_) from user_cash_account_record a where a.account_id_ = t.user_id_
-                and a.post_status_ = 'RECORDED' and a.in_or_out_ = 'IN'
+                and a.post_status_ in ('RECORDED','WAIT') and a.in_or_out_ = 'IN'
                 and a.biz_type_ in ('LIVE_SHARE','VIDEO_SHARE','MUSIC_SHARE','VIP_SHARE','MALL_SHARE')) as amountShare
         FROM user_cash_account t
         where t.user_id_ = #{id}