diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
index 06ced2315..644a13bab 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java
@@ -23,6 +23,8 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.List;
/**
@@ -69,6 +71,11 @@ public class MemberGroupServiceImpl implements MemberGroupService {
if (CollectionUtils.isEmpty(resultList)) {
return Lists.newArrayList();
}
+ for (MemberGroupVO memberGroupVO : resultList) {
+ BigDecimal discount = memberGroupVO.getDiscount();
+ // 返回给前端乘以10
+ memberGroupVO.setDiscount(discount.multiply(BigDecimal.TEN));
+ }
return resultList;
}
@@ -89,9 +96,24 @@ public class MemberGroupServiceImpl implements MemberGroupService {
} catch (Exception e) {
}
+
+ if (isBetween(memberGroup.getDiscount())) {
+ // 入库除以10
+ memberGroup.setDiscount(memberGroup.getDiscount().divide(BigDecimal.TEN, 2, RoundingMode.DOWN));
+ }
return memberGroupMapper.insertMemberGroup(memberGroup);
}
+ private boolean isBetween(BigDecimal price){
+ BigDecimal start = BigDecimal.ZERO;
+ BigDecimal end = BigDecimal.TEN;
+ return isBetween(price, start, end);
+ }
+
+ private boolean isBetween(BigDecimal price, BigDecimal start, BigDecimal end){
+ return price.compareTo(start) > 0 && price.compareTo(end) < 0;
+ }
+
// 生成编号
private String generateGroupCode() {
while (true) {
diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue
index d4425faa6..154e23dc0 100644
--- a/jsowell-ui/src/views/member/memberGroup/index.vue
+++ b/jsowell-ui/src/views/member/memberGroup/index.vue
@@ -104,7 +104,11 @@
-
+
+
+ {{ scope.row.discount }}折
+
+