update

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java

@@ -77,4 +77,6 @@ public interface MemberGroupMapper {
     MemberDiscountVO queryMemberDiscount(@Param("merchantId") String merchantId, @Param("stationId") String stationId, @Param("memberId") String memberId);
 
     List<MemberVO> queryMemberList(@Param("groupCode") String groupCode);
+
+    MemberGroup selectByGroupCode(String groupCode);
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderMonitorDataMapper.java

@@ -10,13 +10,6 @@ public interface OrderMonitorDataMapper {
      */
     int deleteByPrimaryKey(Integer id);
 
-    /**
-     * insert record to table
-     * @param record the record
-     * @return insert count
-     */
-    int insert(OrderMonitorData record);
-
     /**
      * insert record to table selective
      * @param record the record

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

@@ -1,14 +1,19 @@
 package com.jsowell.pile.service.impl;
 
 import com.google.common.collect.Lists;
+import com.jsowell.common.enums.DelFlagEnum;
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.SecurityUtils;
+import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.id.IdUtils;
+import com.jsowell.pile.domain.MemberBasicInfo;
 import com.jsowell.pile.domain.MemberGroup;
+import com.jsowell.pile.domain.MemberGroupRelation;
 import com.jsowell.pile.dto.MemberGroupDTO;
 import com.jsowell.pile.mapper.MemberGroupMapper;
+import com.jsowell.pile.service.MemberBasicInfoService;
+import com.jsowell.pile.service.MemberGroupRelationService;
 import com.jsowell.pile.service.MemberGroupService;
-import com.jsowell.pile.service.OrderBasicInfoService;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.web.MemberDiscountVO;
 import com.jsowell.pile.vo.web.MemberGroupVO;
@@ -32,7 +37,10 @@ public class MemberGroupServiceImpl implements MemberGroupService {
     private MemberGroupMapper memberGroupMapper;
 
     @Autowired
-    private OrderBasicInfoService orderBasicInfoService;
+    private MemberGroupRelationService memberGroupRelationService;
+
+    @Autowired
+    private MemberBasicInfoService memberBasicInfoService;
 
     /**
      * 查询会员组
@@ -98,7 +106,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
      * @return
      */
     public MemberGroup selectByGroupCode(String groupCode) {
-        return null;
+        return memberGroupMapper.selectByGroupCode(groupCode);
     }
 
     /**
@@ -146,7 +154,31 @@ public class MemberGroupServiceImpl implements MemberGroupService {
 
     @Override
     public int addMember(MemberGroupDTO dto) {
-        return 1;
+        String groupCode = dto.getGroupCode();
+        if (StringUtils.isBlank(groupCode)) {
+            return 0;
+        }
+        // 校验会员组是否存在
+        MemberGroup memberGroup = selectByGroupCode(groupCode);
+        if (memberGroup == null) {
+            return 0;
+        }
+        // 查询会员id
+        String phoneNumber = dto.getPhoneNumber();
+        String firstLevelMerchantId = "";
+        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, firstLevelMerchantId);
+        if (memberBasicInfo == null) {
+            return 0;
+        }
+        // 校验通过，关系存入数据库
+        List<MemberGroupRelation> list = Lists.newArrayList();
+        MemberGroupRelation relation = new MemberGroupRelation();
+        relation.setMemberId(memberBasicInfo.getMemberId());
+        relation.setGroupCode(groupCode);
+        relation.setCreateTime(DateUtils.getNowDate());
+        relation.setDelFlag(DelFlagEnum.NORMAL.getValue());
+        memberGroupRelationService.batchInsert(list);
+        return memberGroupRelationService.batchInsert(list);
     }
 
     @Override

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

@@ -26,6 +26,7 @@ public class OrderMonitorDataServiceImpl implements OrderMonitorDataService {
 
     @Override
     public int insertSelective(OrderMonitorData record) {
+        // 防止重复入库
         return orderMonitorDataMapper.insertSelective(record);
     }
 

jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml

@@ -24,7 +24,9 @@
     </sql>
 
     <sql id="selectMemberGroupVo">
-        select id, group_code, merchant_id, station_id, group_level, group_type, discount, create_by, create_time, update_by, update_time, del_flag from member_group
+        select
+        <include refid="Base_Column_List"/>
+        from member_group
     </sql>
 
     <select id="selectMemberGroupList" parameterType="com.jsowell.pile.domain.MemberGroup" resultMap="MemberGroupResult">
@@ -155,7 +157,11 @@
             t2.group_code = #{groupCode,jdbcType=VARCHAR}
     </select>
 
-    <select id="queryOrderList" resultType="com.jsowell.pile.vo.web.OrderListVO">
+    <select id="selectByGroupCode" resultMap="MemberGroupResult">
-
+        select
+            <include refid="Base_Column_List"/>
+        from member_group
+        where del_flag = '0'
+        and group_code = #{groupCode,jdbcType=VARCHAR}
     </select>
 </mapper>

jsowell-pile/src/main/resources/mapper/pile/OrderMonitorDataMapper.xml

@@ -26,13 +26,7 @@
     delete from order_monitor_data
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.jsowell.pile.domain.OrderMonitorData">
+
-    <!--@mbg.generated-->
-    insert into order_monitor_data (id, order_code, transaction_code, monitor_data,
-      create_time)
-    values (#{id,jdbcType=INTEGER}, #{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{monitorData,jdbcType=VARCHAR},
-      #{createTime,jdbcType=TIMESTAMP})
-  </insert>
   <insert id="insertSelective" parameterType="com.jsowell.pile.domain.OrderMonitorData">
     <!--@mbg.generated-->
     insert into order_monitor_data