地址管理

src/main/java/com/mmc/oms/entity/mall/UserAddressDO.java

@@ -59,8 +59,12 @@ public class UserAddressDO implements Serializable {
     @ApiModelProperty(value = "逻辑删除")
     private List<Integer> isDeleteds;
 
-    public UserAddressDO(Integer userAccountId, Integer type) {
+    @ApiModelProperty(value = "标识;0是后台管理 100客户端 小程序")
+    private Integer flag;
+
+    public UserAddressDO(Integer userAccountId, Integer type,Integer flag) {
         this.userAccountId = userAccountId;
         this.type = type;
+        this.flag = flag;
     }
 }

src/main/java/com/mmc/oms/model/qo/mall/UserAddressQO.java

@@ -54,4 +54,7 @@ public class UserAddressQO implements Serializable {
 
     @ApiModelProperty(value = "逻辑删除")
     private List<Integer> isDeleteds;
+
+    @ApiModelProperty(value = "标识;0：PC，100:小程序",hidden = true)
+    private Integer flag;
 }

src/main/java/com/mmc/oms/service/Impl/UserAddressServiceImpl.java

@@ -27,24 +27,28 @@ public class UserAddressServiceImpl implements UserAddressService {
     @Override
     public ResultBody insert(UserAddressVO param, BaseAccountDTO currentAccount) {
         // 如果之前有默认的话，就要修改为非默认
-        isDefault(param, currentAccount.getUserAccountId());
+        isDefault(param, currentAccount);
         UserAddressDO userAddressDO = BeanCopyUtils.properties(param, new UserAddressDO());
         userAddressDO.setUserAccountId(currentAccount.getUserAccountId());
+        userAddressDO.setFlag(currentAccount.getPortType());
         userAddressDao.insert(userAddressDO);
         return ResultBody.success();
     }
 
-    private void isDefault(UserAddressVO param, Integer userAccountId) {
+    private void isDefault(UserAddressVO param, BaseAccountDTO currentAccount) {
         if(param.getType()!=null && param.getType().equals(0)){
-            userAddressDao.update(new UserAddressDO(userAccountId,1));
+            userAddressDao.update(new UserAddressDO(currentAccount.getUserAccountId(),1,currentAccount.getPortType()));
         }
     }
 
     @Override
     public ResultBody update(UserAddressVO param, BaseAccountDTO currentAccount) {
-        isDefault(param,currentAccount.getUserAccountId());
+        isDefault(param,currentAccount);
         userAddressDao.removeById(param.getId());
-        userAddressDao.insert(BeanCopyUtils.properties(param, new UserAddressDO()));
+        UserAddressDO userAddressDO = BeanCopyUtils.properties(param, new UserAddressDO());
+        userAddressDO.setFlag(currentAccount.getPortType());
+        userAddressDO.setUserAccountId(currentAccount.getUserAccountId());
+        userAddressDao.insert(userAddressDO);
         return ResultBody.success();
     }
 
@@ -64,6 +68,7 @@ public class UserAddressServiceImpl implements UserAddressService {
     @Override
     public ResultBody<List<UserAddressDTO>> selectList(UserAddressQO param, BaseAccountDTO currentAccount) {
         param.setUserAccountId(currentAccount.getUserAccountId());
+        param.setFlag(currentAccount.getPortType());
         UserAddressDO userAddressDO = BeanCopyUtils.properties(param, new UserAddressDO());
         List<UserAddressDO> list = userAddressDao.selectList(userAddressDO);
         List<UserAddressDTO> collect = list.stream().map(item -> BeanCopyUtils.properties(item, new UserAddressDTO())).collect(Collectors.toList());

src/main/resources/mapper/UserAddressDao.xml

@@ -17,13 +17,13 @@
 
     <!-- 基本字段 -->
     <sql id="Base_Column_List">
-        id,user_account_id,take_name,take_phone,take_region,take_address,`type`,created_time,updated_time
+        id,user_account_id,take_name,take_phone,take_region,take_address,`type`,created_time,updated_time,flag
     </sql>
 
     <!-- 新增所有列 -->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true" parameterType="com.mmc.oms.entity.mall.UserAddressDO">
-        insert into user_address(user_account_id, take_name, take_phone, take_region, take_address,`type`)
-        values (#{userAccountId}, #{takeName}, #{takePhone}, #{takeRegion}, #{takeAddress},#{type})
+        insert into user_address(user_account_id, take_name, take_phone, take_region, take_address,`type`,flag)
+        values (#{userAccountId}, #{takeName}, #{takePhone}, #{takeRegion}, #{takeAddress},#{type},#{flag})
     </insert>
 
     <!-- 通过主键修改数据 -->
@@ -57,7 +57,7 @@
                 and id = #{id}
             </if>
             <if test="userAccountId != null">
-                and user_account_id = #{userAccountId}
+                and user_account_id = #{userAccountId} and flag = #{flag}
             </if>
         </where>
     </update>
@@ -113,6 +113,9 @@
                     #{isDeleted}
                 </foreach>
             </if>
+            <if test="flag != null">
+                and flag = #{flag}
+            </if>
         </where>
         order by type ,created_time desc
     </select>