From c7df7344265c6348c77e9cfc90e264f64c1ac064 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Sat, 3 Sep 2022 18:08:20 +0800 Subject: [PATCH] fix bug --- .../db/migration/V2022090300001_seller.sql | 21 ++++ .../schedule/CouponOrderExpiringSchedule.java | 8 +- .../com/iformall/domain/po/SellerAgent.java | 30 ++++++ .../domain/po/SellerAgentAccount.java | 30 ++++++ .../mapper/SellerAgentAccountMapper.java | 20 ++++ .../iformall/mapper/SellerAgentMapper.java | 17 ++++ .../iformall/service/SellerAgentService.java | 28 ++++++ .../service/impl/SellerAgentServiceImpl.java | 98 +++++++++++++++++++ .../impl/WxCouponOrderServiceImpl.java | 8 +- .../service/impl/WxOrderServiceImpl.java | 9 +- .../service/impl/WxPayOrderServiceImpl.java | 4 +- .../service/impl/WxPressBatchServiceImpl.java | 5 - .../service/pay/PayServiceFactory.java | 3 +- .../share/entity/PayShareCalculateAmount.java | 6 +- .../mapper/SellerAgentAccountMapper.xml | 60 ++++++++++++ .../resources/mapper/SellerAgentMapper.xml | 57 +++++++++++ .../resources/mapper/WxOrderPressMapper.xml | 2 +- 17 files changed, 383 insertions(+), 23 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2022090300001_seller.sql create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java create mode 100644 mallinkService/src/main/java/com/iformall/service/SellerAgentService.java create mode 100644 mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java create mode 100644 mallinkService/src/main/resources/mapper/SellerAgentAccountMapper.xml create mode 100644 mallinkService/src/main/resources/mapper/SellerAgentMapper.xml diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022090300001_seller.sql b/mallinkAdmin/src/main/resources/db/migration/V2022090300001_seller.sql new file mode 100644 index 000000000..c6a04c566 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022090300001_seller.sql @@ -0,0 +1,21 @@ +CREATE TABLE `seller_agent` ( + `id` bigint(20) unsigned NOT NULL, + `name` varchar(100) NOT NULL COMMENT '姓名', + `phone` varchar(20) NOT NULL COMMENT '电话', + `create_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + `remark` varchar(300) DEFAULT NULL COMMENT '备注', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + +CREATE TABLE `seller_agent_account` ( + `id` bigint(20) unsigned NOT NULL, + `seller_agent_id` bigint(20) NOT NULL, + `merchant_u_id` varchar(30) NOT NULL COMMENT '商户收款商户号', + `plat` int(1) NOT NULL COMMENT '平台', + `create_time` datetime DEFAULT NULL, + `update_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `UNIQUE_A_M_P` (`seller_agent_id`,`merchant_u_id`,`plat`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; \ No newline at end of file diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 1f411152c..660a8c53f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -12,6 +12,7 @@ import com.iformall.service.WxCouponOrderService; import com.iformall.service.WxOrderService; import com.iformall.service.WxProfitSharingOrderService; import com.iformall.service.WxRefundOrderService; +import com.iformall.service.order.entity.WxComposeChildOrderShare; import com.iformall.utils.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -215,12 +216,13 @@ public class CouponOrderExpiringSchedule { wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); wxSharingOrderDto.updateTenantInfo(wxPayOrder); wxSharingOrderDto.setTransactionId(wxPayOrder.getTransactionId()); - if (wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount() != null) { + WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(co.getOrderId()); + if (share.getRateAmount() != null) { // 实际分账金额为 分账金额 + 通道费差 - wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()+wxPayOrder.getChildOrderShare(co.getOrderId()).getRateAmount()); + wxSharingOrderDto.setShareAmount(share.getShareAmount()+share.getRateAmount()); } else { // 未设置通道费差 - wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(co.getOrderId()).getShareAmount()); + wxSharingOrderDto.setShareAmount(share.getShareAmount()); } //wxSharingOrderDto.setShareAmount(wxPayOrder.getPayAmount()); wxProfitSharingOrderService.createSharingOrder(wxSharingOrderDto,wxPayOrder); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java new file mode 100644 index 000000000..1c66b2a74 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgent.java @@ -0,0 +1,30 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; + +@TableName(value = "seller_agent") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class SellerAgent extends BaseEntity { + + private static final long serialVersionUID = 6722507735075416305L; + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="姓名",name="name") + private String name; + @io.swagger.annotations.ApiModelProperty(value="电话",name="phone") + private String phone; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") + private Date createTime; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") + private Date updateTime; + @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") + private String remark; +} diff --git a/mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java new file mode 100644 index 000000000..cd5854f7c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/SellerAgentAccount.java @@ -0,0 +1,30 @@ +package com.iformall.domain.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import java.util.Date; + +@TableName(value = "seller_agent_account") +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class SellerAgentAccount extends BaseEntity { + + private static final long serialVersionUID = 6722507735075416305L; + + protected Long id; + + @io.swagger.annotations.ApiModelProperty(value="销售代理id",name="sellerAgentId") + private Long sellerAgentId; + @io.swagger.annotations.ApiModelProperty(value="收款商户号",name="merchantUId") + private String merchantUId; + @io.swagger.annotations.ApiModelProperty(value="EnumAppPlat",name="createTime") + private Integer plat; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") + private Date createTime; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") + private Date updateTime; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java new file mode 100644 index 000000000..0d04b5651 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentAccountMapper.java @@ -0,0 +1,20 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.SellerAgentAccount; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +public interface SellerAgentAccountMapper extends CommonMapper { + + List findList(SellerAgentAccount record); + + SellerAgentAccount getById(@Param("id")Long id); + + void deleteById(@Param("id")Long id); + + void deleteByAgentId(@Param("agentId")Long agentId); + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java new file mode 100644 index 000000000..a46d6a21a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/SellerAgentMapper.java @@ -0,0 +1,17 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.SellerAgent; +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +public interface SellerAgentMapper extends CommonMapper { + + List findList(SellerAgent record); + + SellerAgent getById(@Param("id")Long id); + + void deleteById(@Param("id")Long id); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/SellerAgentService.java b/mallinkService/src/main/java/com/iformall/service/SellerAgentService.java new file mode 100644 index 000000000..7c365523e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/SellerAgentService.java @@ -0,0 +1,28 @@ +package com.iformall.service; + +import java.util.*; + +import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.SellerAgent; +import com.iformall.domain.po.SellerAgentAccount; + +public interface SellerAgentService { + + PageInfo listAsPage(SellerAgent record, Integer pageIndex, Integer pageSize); + + List list(SellerAgent agent); + + void saveOrUpdate(SellerAgent agent); + + SellerAgent getById(Long id); + + List getAccountList(Long agentId, Integer plat); + + void saveOrUpdateAccount(SellerAgentAccount agentAccount); + + void deleteSellerAgent(Long id); + void deleteAccountById(Long accountId); + void deleteAccountByAgentId(Long agentId); + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java new file mode 100644 index 000000000..5fafe4bee --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/SellerAgentServiceImpl.java @@ -0,0 +1,98 @@ +package com.iformall.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.domain.po.*; +import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.CouponPressBatchVo; +import com.iformall.enums.EnumPressBatchStatus; +import com.iformall.enums.EnumYesOrNo; +import com.iformall.exception.MallinkException; +import com.iformall.mapper.*; +import com.iformall.service.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; + +@Service +public class SellerAgentServiceImpl implements SellerAgentService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + SellerAgentMapper sellerAgentMapper; + @Autowired + SellerAgentAccountMapper sellerAgentAccountMapper; + + @Override + public List list(SellerAgent record){ + return sellerAgentMapper.findList(record); + } + + @Override + public PageInfo listAsPage(SellerAgent record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> sellerAgentMapper.findList(record)); + } + + @Override + public void saveOrUpdate(SellerAgent record) { + if (null == record.getId()) { + record.setCreateTime(new Date()); + record.setUpdateTime(new Date()); + sellerAgentMapper.insert(record); + }else { + record.setUpdateTime(new Date()); + sellerAgentMapper.updateById(record); + } + } + + @Override + public SellerAgent getById(Long id) { + return sellerAgentMapper.getById(id); + } + + @Override + public List getAccountList(Long agentId, Integer plat) { + SellerAgentAccount iteq = new SellerAgentAccount(); + iteq.setSellerAgentId(agentId); + iteq.setPlat(plat); + return sellerAgentAccountMapper.findList(iteq); + } + + @Override + public void saveOrUpdateAccount(SellerAgentAccount record) { + if (null == record.getId()) { + record.setCreateTime(new Date()); + record.setUpdateTime(new Date()); + sellerAgentAccountMapper.insert(record); + }else { + record.setUpdateTime(new Date()); + sellerAgentAccountMapper.updateById(record); + } + } + + @Override + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) + public void deleteSellerAgent(Long id) { + sellerAgentMapper.deleteById(id); + deleteAccountByAgentId(id); + } + + @Override + public void deleteAccountById(Long accountId) { + sellerAgentAccountMapper.deleteById(accountId);; + } + + @Override + public void deleteAccountByAgentId(Long agentId) { + sellerAgentAccountMapper.deleteByAgentId(agentId); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c1f1dc94a..44fa8a8e7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1753,10 +1753,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); } wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); - wxSharingOrderDto.setShareAmount(wxPayOrder.getChildOrderShare(couponOrder.getOrderId()).getShareAmount()); - wxSharingOrderDto.setRateAmount(wxPayOrder.getChildOrderShare(couponOrder.getOrderId()).getRateAmount()); - wxSharingOrderDto.setRealRateAmount(wxPayOrder.getChildOrderShare(couponOrder.getOrderId()).getRealRateAmount()); - wxSharingOrderDto.setCommissionAmount(wxPayOrder.getChildOrderShare(couponOrder.getOrderId()).getCommissionAmount()); + wxSharingOrderDto.setShareAmount(childShare.getShareAmount()); + wxSharingOrderDto.setRateAmount(childShare.getRateAmount()); + wxSharingOrderDto.setRealRateAmount(childShare.getRealRateAmount()); + wxSharingOrderDto.setCommissionAmount(childShare.getCommissionAmount()); wxSharingOrderDto.setOrderId(wxPayOrder.getId()); wxSharingOrderDto.setPayTimeStart(wxPayOrder.getPayTimeStart()); wxSharingOrderDto.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 5bb253404..e026396c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2586,10 +2586,11 @@ public class WxOrderServiceImpl implements WxOrderService { sharingOrder.setMerchantId(wxMerchantBUser.getMerchantId()); sharingOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); sharingOrder.setPayAmount(wxPayOrder.getPayAmount()); - sharingOrder.setShareAmount(wxPayOrder.getChildOrderShare(orderId).getShareAmount()); - sharingOrder.setRateAmount(wxPayOrder.getChildOrderShare(orderId).getRateAmount()); - sharingOrder.setRealRateAmount(wxPayOrder.getChildOrderShare(orderId).getRealRateAmount()); - sharingOrder.setCommissionAmount(wxPayOrder.getChildOrderShare(orderId).getCommissionAmount()); + WxComposeChildOrderShare share = wxPayOrder.getChildOrderShare(orderId); + sharingOrder.setShareAmount(share.getShareAmount()); + sharingOrder.setRateAmount(share.getRateAmount()); + sharingOrder.setRealRateAmount(share.getRealRateAmount()); + sharingOrder.setCommissionAmount(share.getCommissionAmount()); sharingOrder.setOrderId(wxPayOrder.getId()); sharingOrder.setPayTimeStart(wxPayOrder.getPayTimeStart()); sharingOrder.setPayTimeEnd(wxPayOrder.getPayTimeEnd()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index 606d19519..5bea653dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -453,15 +453,15 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { Long merchant_id = null; String merchant_uid = ""; if(EnumPayMchType.DIRECT.equals(payMchType)){//直连模式记录收款商户 + //11111111111加缓存 merchant_id = wxCouponChannelService.getCouponOneMerchantId(o.getCouponChannelId(),o.getTenantId()); WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, merchant_id, null, payMchTypeEnum.getCode()); -// merchant_uid = wxCouponChannelService.getCouponOneMerchantUid(payWay,merchant_id,o.getTenantId()); -// if(null == merchant_id || StringUtils.isBlank(merchant_uid)){ if(receiver == null){ throw new MallinkException(ErrorCode.PAY_ORDER_MERCHANT_UID_ERROR); } merchant_uid = receiver.getReceiverAccount(); } + //1111111111111加缓存 int rate = payShareServie.getOfficialCommission(o,payAccount);//抖音分佣率 logger.info("抖音分佣率"+rate); PayShareCalculateAmount oShareAmount = payShareServie.calculateAmount(o.getPayment(),rate, payAccount); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java index 7baabd50a..b5e2f9467 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java @@ -183,9 +183,4 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { return null; } - - - - - } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java index 225046e46..8ef7408d0 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/PayServiceFactory.java @@ -112,7 +112,8 @@ public class PayServiceFactory { if (null == qrcodeMap) { qrcodeMap = new ConcurrentHashMap(); qrcodeMap.put(EnumAppPlat.WX.getCode()+"_"+EnumPayVersion.WX_PAY_V2.getCode(), wxMiniAppPayService); - qrcodeMap.put(EnumAppPlat.WX.getCode()+"_"+EnumPayVersion.WX_PAY_V3_SFT.getCode(), wxMiniAppPayService); + qrcodeMap.put(EnumAppPlat.WX.getCode()+"_"+EnumPayVersion.WX_PAY_V3_SFT.getCode(), wxMiniAppPaySFTAdapterService); + qrcodeMap.put(EnumAppPlat.WX.getCode()+"_"+EnumPayVersion.WX_PAY_V3.getCode(), wxMiniAppPayV3AdapterService); qrcodeMap.put(EnumAppPlat.TOUTIAO.getCode()+"_"+EnumPayVersion.DY_PAY_V2.getCode(),ttMiniAppPayService); } return qrcodeMap; diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java index 473cdbe67..1e87383f3 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/entity/PayShareCalculateAmount.java @@ -12,9 +12,9 @@ public class PayShareCalculateAmount implements Serializable{ private static final long serialVersionUID = -3701322871877301001L; private Integer payAmount; - private Integer mallCharge;//商场拿走的钱+平台手续费 - private Integer realRateAmount;//平台手续费 - private Integer commissionAmount;//平台佣金 + private Integer mallCharge;//商场拿走的钱+realRateAmount + private Integer realRateAmount;//平台手续费(微信,抖音的支付通道费) + private Integer commissionAmount;//平台佣金(微信,抖音平台抽点) //分账的钱 public Integer getShareAmount() { diff --git a/mallinkService/src/main/resources/mapper/SellerAgentAccountMapper.xml b/mallinkService/src/main/resources/mapper/SellerAgentAccountMapper.xml new file mode 100644 index 000000000..f681b2bdf --- /dev/null +++ b/mallinkService/src/main/resources/mapper/SellerAgentAccountMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + `id`, `seller_agent_id`, `merchant_u_id`, `create_time`, `update_time`, `plat` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `seller_agent_id` = #{sellerAgentId} + + + + and `plat` = #{plat} + + + + and `id` in + + #{idItem} + + + + + + + + + + delete from seller_agent_account where `id` = #{id} + + + + delete from seller_agent_account where `seller_agent_id` = #{agentId} + + diff --git a/mallinkService/src/main/resources/mapper/SellerAgentMapper.xml b/mallinkService/src/main/resources/mapper/SellerAgentMapper.xml new file mode 100644 index 000000000..f1ef7abf9 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/SellerAgentMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + `id`, `name`, `phone`, `create_time`, `update_time`, `remark` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `name` like concat('%', #{name},'%') + + + + and `phone` like concat('%', #{phone},'%') + + + + and `id` in + + #{idItem} + + + + + + + + + + + delete from seller_agent where `id` = #{id} + + diff --git a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml index 443731d42..a3fe2c222 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml @@ -61,7 +61,7 @@ - select from wx_order_press op where op.`order_id` = #{orderId} and op.tenant_id = #{tenantId}