Sfoglia il codice sorgente

fix order

release_toaliyun_real
xiaohanzi 4 anni fa
parent
commit
b85f4d9a0d
4 ha cambiato i file con 2 aggiunte e 9 eliminazioni
  1. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java
  2. +0
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  4. +0
    -6
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java Vedi File

@@ -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")


+ 0
- 2
mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java Vedi File

@@ -67,6 +67,4 @@ public interface WxOrderMapper extends CommonMapper<WxOrder, Long> {
void updateCUserId(WxOrder updateOrder);
void updateComposeOrderId(@Param("id")Long id,@Param("composeOrderId")Long composeOrderId,@Param("tenantId")String tenantId);

}

+ 0
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Vedi File

@@ -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;


+ 0
- 6
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Vedi File

@@ -1025,10 +1025,4 @@
</if>
</update>
<update id="updateComposeOrderId" parameterType="java.util.HashMap">
update wx_order set compose_order_id = #{composeOrderId} where id = #{id} and tenant_id = #{tenantId}
</update>

</mapper>

Caricamento…
Annulla
Salva