diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java index 44802904d..902ed70e1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxProfitSharingResultMapper.java @@ -3,14 +3,11 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxProfitSharingResult; +import org.apache.ibatis.annotations.Param; public interface WxProfitSharingResultMapper extends CommonMapper { List findList(WxProfitSharingResult wxProfitSharingResult); - - - - - + int deleteBySharingOrderId(@Param(value = "sharingOrderId")Long sharingOrderId, @Param(value = "tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index 380d464b6..bb3f3b786 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -692,9 +692,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } map.put("realRate",payAccount.getRealRate()); - map.put("systemRate",payAccount.getSystemRate()+payAccount.getSellRate()); int rate = 0; if(EnumYesOrNo.YES.getCode().equals(payAccount.getIsCommission())){ + map.put("systemRate",payAccount.getSystemRate()+payAccount.getSellRate()); rate = payAccount.getRealRate()+payAccount.getSystemRate()+payAccount.getSellRate(); }else{ rate = payAccount.getRealRate(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java index 2ca81f9d6..1eb923ef5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingOrderServiceImpl.java @@ -347,10 +347,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ receivers.add(jo); } try{ - WxProfitSharingResult resultDel = new WxProfitSharingResult(); - resultDel.updateTenantInfo(sharingOrder); - resultDel.setSharingOrderId(sharingOrder.getId()); - int delete = wxProfitSharingResultMapper.delete(new QueryWrapper<>()); + int delete = wxProfitSharingResultMapper.deleteBySharingOrderId(sharingOrder.getId(),sharingOrder.getTenantId()); final IdWorker idworker = IdWorker.get(); receivers.stream().forEach(obj -> { JSONObject o =(JSONObject) obj; diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingResultMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingResultMapper.xml index 77e471566..693345634 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingResultMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingResultMapper.xml @@ -95,6 +95,12 @@ from wx_profit_sharing_result + + + delete from wx_profit_sharing_result + where `tenant_id` = #{tenantId} + and `sharing_order_id` = #{sharingOrderId} +