diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java index 2927fcb77..aaf76ce2f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOrderPress.java @@ -21,7 +21,10 @@ public class WxOrderPress implements Serializable { protected List ids; @Transient protected String sortColumns; - + + /**租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; /**订单ID*/ @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; @@ -40,6 +43,7 @@ public class WxOrderPress implements Serializable { public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,OrderId_ASC("`order_id` ASC"),OrderId_DESC("`order_id` DESC") ,UserId_ASC("`user_id` ASC"),UserId_DESC("`user_id` DESC") ,PressValue_ASC("`press_value` ASC"),PressValue_DESC("`press_value` DESC") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java index 58e187976..20e57a903 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderPressMapper.java @@ -2,7 +2,6 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; -import org.apache.ibatis.annotations.Param; import com.iformall.domain.po.WxOrderPress; public interface WxOrderPressMapper extends CommonMapper { 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 b18fbea1c..8edb87d17 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -401,7 +401,8 @@ public class WxOrderServiceImpl implements WxOrderService { orderPress.setOrderId(orderNumber); orderPress.setUserId(user.getId()); orderPress.setCreateDate(curr); - orderPress.setPressValue(PressUtils.stateLessPressValue(total, left_total, coupon.getPressLimitNum(), 0)); + int lPressValue = PressUtils.stateLessPressValue(total, left_total, coupon.getPressLimitNum(), 0); + orderPress.setPressValue(lPressValue); try { // 保存订单 diff --git a/mallinkService/src/main/java/com/iformall/utils/PressUtils.java b/mallinkService/src/main/java/com/iformall/utils/PressUtils.java index ed0327567..9b0c327a0 100755 --- a/mallinkService/src/main/java/com/iformall/utils/PressUtils.java +++ b/mallinkService/src/main/java/com/iformall/utils/PressUtils.java @@ -49,4 +49,9 @@ public class PressUtils { return current.intValue() * 100; } + public static void main(String[] args) { + int iValue = stateLessPressValue( 1800, 1800, 5, 0); + System.out.println(iValue); + } + } diff --git a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml index efc49034a..72a9aaf6b 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml @@ -3,6 +3,7 @@ + @@ -17,8 +18,11 @@ where 1 = 1 and `id` = #{id} - - + + + and `tenant_id` = #{tenantId} + + and `order_id` = #{orderId}