Merge branch 'dev_share_20221202'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/PlatformCashAccountRecordDao.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.search.PlatformCashAccountRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.PlatformCashAccountRecord;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.cooleshow.biz.dal.vo.PlatformCashAccountRecordSummaryVo;
 
 import io.swagger.models.auth.In;
@@ -33,7 +34,8 @@ public interface PlatformCashAccountRecordDao extends BaseMapper<PlatformCashAcc
 
     List<PlatformCashAccountRecord> queryByBizTypeAndPaymentDays(@Param("bizType")String bizType, @Param("paymentDays")int paymentDays);
 
-    Integer cancelRecord(@Param("orderNo")String orderNo,@Param("bizType") String bizType, @Param("bizId") Long bizId);
+    Integer cancelRecord(@Param("orderNo") String orderNo, @Param("bizType") String bizType, @Param(
+            "bizId") Long bizId, @Param("type") InOrOutEnum type);
 
     Integer mallRecordedRecord(@Param("orderNo")String orderNo,@Param("bizType") String bizType, @Param("bizId") Long bizId);
 

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

@@ -41,7 +41,7 @@ public interface PlatformCashAccountRecordService extends IService<PlatformCashA
      * @param bizType
      * @param bizId
      */
-    void cancelRecord(String orderNo, String bizType, Long bizId);
+    void cancelRecord(String orderNo, String bizType, Long bizId,InOrOutEnum type);
 
     /**
      * 设置商城预收-> 实收

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

@@ -90,12 +90,14 @@ public class PlatformCashAccountRecordServiceImpl extends ServiceImpl<PlatformCa
     }
 
     @Override
-    public void cancelRecord(String orderNo, String bizType, Long bizId) {
+    public void cancelRecord(String orderNo, String bizType, Long bizId,InOrOutEnum type) {
         if(StringUtil.isEmpty(orderNo) || StringUtil.isEmpty(bizType) || null == bizId){
             return;
         }
-        baseMapper.cancelRecord(orderNo, bizType, bizId);
-        baseMapper.cancelRecord(orderNo, bizType + "_SHARE", bizId);
+        baseMapper.cancelRecord(orderNo, bizType, bizId,type);
+        if (type.equals(InOrOutEnum.IN)) {
+            baseMapper.cancelRecord(orderNo, bizType + "_SHARE", bizId, InOrOutEnum.OUT);
+        }
     }
 
     @Override

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

@@ -454,7 +454,7 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountDao, UserAcco
             platformCashAccountRecordService.mallRecordedRecord(shareDto.getProductSkuId(), shareDto.getOrderSn(), AccountBizTypeEnum.MALL.getCode());
 
         } else if (shareDto.getStatus().equals(PostStatusEnum.CANCEL)) {
-            platformCashAccountRecordService.cancelRecord(shareDto.getOrderSn(), AccountBizTypeEnum.MALL.getCode(), shareDto.getProductSkuId());
+            platformCashAccountRecordService.cancelRecord(shareDto.getOrderSn(), AccountBizTypeEnum.MALL.getCode(), shareDto.getProductSkuId(),InOrOutEnum.IN);
         }
 
         // 修改老师分润

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

@@ -14,6 +14,7 @@ import com.yonge.cooleshow.biz.dal.dto.search.UserOrderRefundSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.GoodTypeEnum;
+import com.yonge.cooleshow.biz.dal.enums.InOrOutEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
@@ -637,10 +638,13 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
             if (PostStatusEnum.WAIT.equals(userAccountRecord.getPostStatus())
                     || PostStatusEnum.FROZEN.equals(userAccountRecord.getPostStatus())) {
                 userAccountService.accountChange(userAccountRecord, PostStatusEnum.CANCEL);
+                platformCashAccountRecordService.cancelRecord(userAccountRecord.getOrderNo(), userAccountRecord.getBizType().getCode(), userAccountRecord.getBizId(),
+                                                              InOrOutEnum.OUT);
             }
         }
         //处理平台入账
-        platformCashAccountRecordService.cancelRecord(vo.getOrderNo(),vo.getGoodType().getCode(),vo.getBizId());
+        platformCashAccountRecordService.cancelRecord(vo.getOrderNo(), vo.getGoodType().getCode(), vo.getBizId(),
+                                                      InOrOutEnum.IN);
     }
 
     /**

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

@@ -162,7 +162,7 @@
     <update id="cancelRecord">
 		update platform_cash_account_record set post_status_ = 'CANCEL'
 		where  order_no_ = #{orderNo} and biz_id_ = #{bizId}
-		and biz_type_ = #{bizType}
+		and biz_type_ = #{bizType} and in_or_out_ = #{type}
 	</update>
 
     <update id="mallRecordedRecord">