Merge branch 'dev_v1_1_20220720'

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/component/CancelOrderReceiver.java

@@ -37,7 +37,11 @@ public class CancelOrderReceiver {
             DistributedLock.of(redissonClient)
                            .runIfLockCanGet(OrderCacheEnum.LOCK_ORDER_NO_MALL.getRedisKey(omsOrder.getOrderSn())
                                    , () -> {
-                                       portalOrderService.cancelOrder(orderId, "超时取消", null);
+                               try {
+                                   portalOrderService.cancelOrder(orderId, "超时取消", null);
+                               }catch (Exception e) {
+                                   logger.warn("超时队列 ： {}",e.fillInStackTrace());
+                               }
                                    }, 60L, TimeUnit.SECONDS);
 
         } catch (BizException e) {

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

@@ -512,7 +512,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
         info.setLiveShareAmount(
                 null == info.getLiveShareAmount() ? BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP) : info.getLiveShareRate().setScale(2, RoundingMode.HALF_UP));
         info.setVideoShareAmount(
-                null == info.getVideoShareAmount() ? BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP) : info.getVipShareAmount().setScale(2, RoundingMode.HALF_UP));
+                null == info.getVideoShareAmount() ? BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP) : info.getVideoShareAmount().setScale(2, RoundingMode.HALF_UP));
         info.setMusicShareAmount(
                 null == info.getMusicShareAmount() ? BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP) : info.getMusicShareAmount().setScale(2, RoundingMode.HALF_UP));
         info.setVipShareAmount(

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

@@ -155,7 +155,6 @@
         <if test="timeType != null and timeType == 'YEAR'">
             group by t.sys_day_ym_
         </if>
-        order by t.sys_day_ymd_
     </select>
 
     <select id="totalTransAmountByOrderNo" resultType="java.math.BigDecimal">