From b85f4d9a0d2d52ccfb9452fdac37531d01905eaa Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 14 Sep 2021 11:09:07 +0800 Subject: [PATCH] fix order --- .../src/main/java/com/iformall/domain/po/WxBatchOrder.java | 2 ++ .../src/main/java/com/iformall/mapper/WxOrderMapper.java | 2 -- .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 1 - mallinkService/src/main/resources/mapper/WxOrderMapper.xml | 6 ------ 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java index 77c0f8e43..1b98a8010 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java @@ -24,6 +24,8 @@ public class WxBatchOrder extends TenantEntity { private Long cUserId; @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") private Integer payment; +// @io.swagger.annotations.ApiModelProperty(value="订单状态 已支付/未支付。已取消",name="orderStatus") +// private Integer orderStatus; @io.swagger.annotations.ApiModelProperty(value="创建时间/砍价开始时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index b3b036bc4..face8ae1f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -67,6 +67,4 @@ public interface WxOrderMapper extends CommonMapper { void updateCUserId(WxOrder updateOrder); - void updateComposeOrderId(@Param("id")Long id,@Param("composeOrderId")Long composeOrderId,@Param("tenantId")String tenantId); - } 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 bf71ce643..7ce009e46 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2008,7 +2008,6 @@ public class WxOrderServiceImpl implements WxOrderService { } //如果没有orderId,则用lastOrder的信息 if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId().intValue() <= 0) { - wxOrderMapper.updateComposeOrderId(lastOrder.getId(), lastOrder.getId(), lastOrder.getTenantId()); return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType()); } return composeOrder; diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 6ba45cc63..37482d221 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -1025,10 +1025,4 @@ - - update wx_order set compose_order_id = #{composeOrderId} where id = #{id} and tenant_id = #{tenantId} - - - -