汇鑫大厦用户扫码自动把用户加入集团

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java

@@ -24,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.List;
 
 /**
@@ -101,6 +100,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
         // 生成编号
         memberGroup.setGroupCode(generateGroupCode());
         memberGroup.setCreateTime(DateUtils.getNowDate());
+        memberGroup.setDelFlag(DelFlagEnum.NORMAL.getValue());
         try {
             String createBy = SecurityUtils.getLoginUser().getUsername();
             memberGroup.setCreateBy(createBy);
@@ -108,10 +108,10 @@ public class MemberGroupServiceImpl implements MemberGroupService {
 
         }
 
-        if (isBetween(memberGroup.getDiscount())) {
-            // 入库除以10
-            memberGroup.setDiscount(memberGroup.getDiscount().divide(BigDecimal.TEN, 2, RoundingMode.DOWN));
-        }
+        // if (isBetween(memberGroup.getDiscount())) {
+        //     // 入库除以10
+        //     memberGroup.setDiscount(memberGroup.getDiscount().divide(BigDecimal.TEN, 2, RoundingMode.DOWN));
+        // }
         return memberGroupMapper.insertMemberGroup(memberGroup);
     }
 
@@ -288,11 +288,21 @@ public class MemberGroupServiceImpl implements MemberGroupService {
         return list;
     }
 
+    /**
+     * 根据运营商id查询会员组
+     * @param merchantId 运营商id
+     * @return 会员组VO
+     */
     @Override
     public MemberGroupVO queryByMerchantId(String merchantId) {
         return memberGroupMapper.queryByMerchantId(merchantId);
     }
 
+    /**
+     * 根据站点id查询会员组
+     * @param stationId 站点id
+     * @return 会员组VO
+     */
     @Override
     public MemberGroupVO queryByStationId(String stationId) {
         return memberGroupMapper.queryByStationId(stationId);