退款问题

cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopRechargeService.java

@@ -1,6 +1,7 @@
 package com.czg.market.service;
 
 import com.czg.enums.ShopUserFlowBizEnum;
+import com.czg.exception.CzgException;
 import com.czg.market.dto.MkShopRechargeDTO;
 import com.czg.market.vo.MkShopRechargeShopListVO;
 import com.czg.market.vo.MkShopRechargeVO;
@@ -21,7 +22,7 @@ import java.util.List;
  */
 public interface MkShopRechargeService extends IService<MkShopRecharge> {
 
-    MkShopRechargeVO detail(Long shopId);
+    MkShopRechargeVO detail(Long shopId) throws CzgException;
 
     MkShopRechargeVO detailApp(Long shopId);
 

cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderPayment.java

@@ -81,7 +81,7 @@ public class OrderPayment implements Serializable {
      */
     private String tradeNumber;
 
-    @Column(onUpdateValue = "now()")
+//    @Column(onUpdateValue = "now()")
     private LocalDateTime payTime;
 
     /**

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java

@@ -253,6 +253,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
     @Override
     @CacheEvict(key = "#shopInfoEditDTO.id")
     public Boolean edit(ShopInfoEditDTO shopInfoEditDTO) {
+        shopInfoEditDTO.setIsMemberPrice(null);
         ShopInfo shopInfo;
         if (!StpKit.USER.isAdmin()) {
             shopInfo = queryChain().eq(ShopInfo::getId, StpKit.USER.getShopId()).one();
@@ -319,8 +320,6 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
             rabbitPublisher.sendOrderDetailStatusMsg(shopInfo.getId().toString(), "shopInfoUpdate");
             return true;
         }
-
-
         return false;
     }
 

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java

@@ -26,8 +26,6 @@ import com.czg.market.vo.InviteUserVO;
 import com.czg.market.vo.MkDistributionConfigVO;
 import com.czg.order.dto.MkDistributionPayDTO;
 import com.czg.order.entity.OrderInfo;
-import com.czg.market.service.OrderInfoService;
-import com.czg.order.service.OrderPaymentService;
 import com.czg.sa.StpKit;
 import com.czg.service.market.enums.OrderStatusEnums;
 import com.czg.service.market.mapper.MkDistributionUserMapper;
@@ -685,22 +683,15 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
                 .ne(MkDistributionFlow::getStatus, TableValueConstant.DistributionFlow.Status.REFUND.getCode()));
 
         list.forEach(item -> {
-            MkDistributionFlow refundFlow = BeanUtil.copyProperties(item, MkDistributionFlow.class);
-            refundFlow.setStatus(TableValueConstant.DistributionFlow.Status.REFUND.getCode());
-            refundFlow.setSourceId(item.getId());
-            refundFlow.setId(null);
-            refundFlow.setCreateTime(DateUtil.date().toLocalDateTime());
-            refundFlow.setUpdateTime(DateUtil.date().toLocalDateTime());
             if (TableValueConstant.DistributionFlow.Status.PENDING.getCode().equals(item.getStatus())) {
-                item.setStatus(TableValueConstant.DistributionFlow.Status.SUCCESS.getCode());
-//                updateIncome(item.getRewardAmount().negate(), BigDecimal.ZERO, BigDecimal.ZERO, item.getDistributionUserId(), item.getUserId(), item.getShopUserId(), item.getShopId(), item.getLevel());
+                item.setStatus(TableValueConstant.DistributionFlow.Status.REFUND.getCode());
                 distributionFlowService.updateById(item);
+                mapper.updateIncome(item.getRewardAmount().negate(), null, null, item.getDistributionUserId(), item.getShopId());
             } else {
                 // 执行扣款
                 updateIncome(BigDecimal.ZERO, item.getRewardAmount().negate(), BigDecimal.ZERO, item.getDistributionUserId(), item.getUserId(), item.getShopUserId(), item.getShopId(), item.getLevel());
                 updateShopInfoAmount(item.getShopId(), item.getRewardAmount(), orderId, TableValueConstant.DistributionAmountFlow.Type.REFUND, "分销回退");
             }
-            distributionFlowService.save(refundFlow);
         });
     }
 
@@ -738,6 +729,13 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
         distributionDeliverService.save(deliver);
     }
 
+    /**
+     * 分销金额修改
+     *
+     * @param pendingIncome 待入账金额
+     * @param receivedIncome 已入账
+     * @param withdrawIncome 已提现
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId, Long shopUserId, Long shopId, Integer isOne) {

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java

@@ -72,7 +72,7 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
     }
 
     @Override
-    public MkShopRechargeVO detail(Long shopId) {
+    public MkShopRechargeVO detail(Long shopId) throws CzgException{
         shopId = shopInfoService.getMainIdByShopId(shopId);
         ShopInfo shopInfo = shopInfoService.getById(shopId);
         if (shopInfo.getMainId() != null) {

cash-service/market-service/src/main/resources/mapper/MkDistributionFlowMapper.xml

@@ -45,36 +45,33 @@
         order by a.create_time desc
     </select>
     <select id="totalAmount" resultType="java.math.BigDecimal">
-        select sum(a.amount) from mk_distribution_flow as a
-        left join mk_distribution_user as d on d.id=a.distribution_user_id
-        left join tb_shop_user as b on a.shop_user_id=b.id
-        left join tb_shop_user as c on c.id=a.shop_user_id
+        select sum(a.reward_amount)
+        from mk_distribution_flow as a
+        left join tb_shop_user as b on a.shop_user_id = b.id
         where a.shop_id=#{shopId}
+        <if test="id != null">
+            and a.shop_user_id=#{id}
+        </if>
+        <if test="userId != null">
+            and a.user_id=#{userId}
+        </if>
+        <if test="status != null and status != ''">
+            and a.status=#{status}
+        </if>
+        <if test="type != null and type != ''">
+            and a.type=#{type}
+        </if>
         <if test="startTime != null">
             and a.create_time>=#{startTime}
         </if>
         <if test="endTime != null">
             and a.create_time&lt;=#{endTime}
         </if>
-        <if test="status != null and status != ''">
-            and a.status=#{status}
-        </if>
         <if test="key != null and key != ''">
             and (
             b.nick_name like concat('%',#{key},'%')
             or b.id like concat('%',#{key},'%')
-            or c.id like concat('%',#{key},'%')
-            or c.nick_name like concat('%',#{key},'%')
             )
         </if>
-        <if test="id != null">
-            and d.id=#{id}
-        </if>
-        <if test="type != null and type != ''">
-            and a.type=#{type}
-        </if>
-        <if test="userId != null">
-            and d.user_id=#{userId}
-        </if>
     </select>
 </mapper>

cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml

@@ -5,16 +5,24 @@
 <mapper namespace="com.czg.service.market.mapper.MkDistributionUserMapper">
     <update id="updateIncome">
         update mk_distribution_user
-        set
+        <set>
             <if test="pendingIncome != null">
                 total_income = total_income + #{pendingIncome},
             </if>
             <if test="receivedIncome != null">
                 total_income = total_income + #{receivedIncome},
             </if>
-            pending_income = pending_income + #{pendingIncome},
-            received_income = received_income + #{receivedIncome},
-            withdrawn_income = withdrawn_income + #{withdrawIncome}
+
+            <if test="pendingIncome != null">
+                pending_income = pending_income + #{pendingIncome},
+            </if>
+            <if test="receivedIncome != null">
+                received_income = received_income + #{receivedIncome},
+            </if>
+            <if test="withdrawIncome != null">
+                withdrawn_income = withdrawn_income + #{withdrawIncome}
+            </if>
+        </set>
         where id = #{id} and shop_id = #{shopId}
     </update>
 

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java

@@ -688,10 +688,7 @@ public class PayServiceImpl implements PayService {
         if (orderInfo.getStatus().equals(OrderStatusEnums.CANCELLED.getCode())) {
             throw new CzgException("订单已过期不可退单");
         }
-        boolean isFirstRefund = true;
-        if (orderInfo.getRefundAmount().compareTo(BigDecimal.ZERO) != 0) {
-            isFirstRefund = false;
-        }
+        boolean isFirstRefund = orderInfo.getRefundAmount().compareTo(BigDecimal.ZERO) == 0;
         ShopInfo shopInfo = shopInfoService.getById(orderInfo.getShopId());
         Map<String, BigDecimal> returnProMap = new HashMap<>();
         boolean isPay = true;
@@ -821,8 +818,8 @@ public class PayServiceImpl implements PayService {
         if (!returnProMap.isEmpty()) {
             rabbitPublisher.sendOrderRefundMsg(JSONObject.toJSONString(Map.of("orderId", orderInfo.getId(), "returnProMap", returnProMap)));
         }
-        refundOrderAfter(orderInfo.getId(), orderInfo.getShopId(), orderInfo.getUserId(), orderInfo.getOrderNo(),
-                orderInfo.getPointsNum(), isFirstRefund, orderInfo.getStatus().equals(OrderStatusEnums.REFUND.getCode()));
+        FunUtils.asyncSafeRunVoid(() -> refundOrderAfter(orderInfo.getId(), orderInfo.getShopId(), orderInfo.getUserId(), orderInfo.getOrderNo(),
+                orderInfo.getPointsNum(), isFirstRefund, orderInfo.getStatus().equals(OrderStatusEnums.REFUND.getCode())));
         return CzgResult.success();
     }
 
@@ -867,12 +864,11 @@ public class PayServiceImpl implements PayService {
             }
             throw new CzgException(refund.getMsg());
         } else {
-            paymentService.updateChain()
-                    .eq(OrderPayment::getId, refundId)
-                    .set(OrderPayment::getPayTime, refund.getData().getRefundTime())
-                    .set(OrderPayment::getTradeNumber, refund.getData().getRefundOrderId())
-                    .set(OrderPayment::getRespJson, JSONObject.toJSONString(refund.getData()))
-                    .update();
+            OrderPayment uOrderPayment = new OrderPayment();
+            uOrderPayment.setPayTime(LocalDateTime.now());
+            uOrderPayment.setTradeNumber(refund.getData().getRefundOrderId());
+            uOrderPayment.setRespJson(JSONObject.toJSONString(refund.getData()));
+            paymentService.update(uOrderPayment, QueryWrapper.create().eq(OrderPayment::getId, refundId));
         }
     }