java110 5 lat temu
rodzic
commit
8d874bee5d
20 zmienionych plików z 917 dodań i 108 usunięć
  1. 83 0
      java110-bean/src/main/java/com/java110/dto/userAddress/UserAddressDto.java
  2. 0 79
      java110-bean/src/main/java/com/java110/po/user/UserAddressPo.java
  3. 60 0
      java110-bean/src/main/java/com/java110/po/userAddress/UserAddressPo.java
  4. 1 0
      java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java
  5. 115 0
      java110-db/src/main/resources/mapper/user/UserAddressServiceDaoImplMapper.xml
  6. 25 27
      java110-generator/src/main/resources/newBack/template_1.json
  7. 53 0
      java110-interface/src/main/java/com/java110/intf/user/IUserAddressInnerServiceSMO.java
  8. 117 0
      service-user/src/main/java/com/java110/user/api/UserAddressApi.java
  9. 17 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/IDeleteUserAddressBMO.java
  10. 16 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/IGetUserAddressBMO.java
  11. 17 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/ISaveUserAddressBMO.java
  12. 19 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/IUpdateUserAddressBMO.java
  13. 34 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/impl/DeleteUserAddressBMOImpl.java
  14. 44 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/impl/GetUserAddressBMOImpl.java
  15. 38 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/impl/SaveUserAddressBMOImpl.java
  16. 34 0
      service-user/src/main/java/com/java110/user/bmo/userAddress/impl/UpdateUserAddressBMOImpl.java
  17. 61 0
      service-user/src/main/java/com/java110/user/dao/IUserAddressServiceDao.java
  18. 98 0
      service-user/src/main/java/com/java110/user/dao/impl/UserAddressServiceDaoImpl.java
  19. 2 2
      service-user/src/main/java/com/java110/user/listener/SaveUserAddressListener.java
  20. 83 0
      service-user/src/main/java/com/java110/user/smo/impl/UserAddressInnerServiceSMOImpl.java

+ 83 - 0
java110-bean/src/main/java/com/java110/dto/userAddress/UserAddressDto.java

@@ -0,0 +1,83 @@
+package com.java110.dto.userAddress;
+
+import com.java110.dto.PageDto;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @ClassName FloorDto
+ * @Description 用户联系地址数据层封装
+ * @Author wuxw
+ * @Date 2019/4/24 8:52
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+public class UserAddressDto extends PageDto implements Serializable {
+
+    private String areaCode;
+private String isDefault;
+private String address;
+private String tel;
+private String userId;
+private String addressId;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+public String getIsDefault() {
+        return isDefault;
+    }
+public void setIsDefault(String isDefault) {
+        this.isDefault = isDefault;
+    }
+public String getAddress() {
+        return address;
+    }
+public void setAddress(String address) {
+        this.address = address;
+    }
+public String getTel() {
+        return tel;
+    }
+public void setTel(String tel) {
+        this.tel = tel;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getAddressId() {
+        return addressId;
+    }
+public void setAddressId(String addressId) {
+        this.addressId = addressId;
+    }
+
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+}

+ 0 - 79
java110-bean/src/main/java/com/java110/po/user/UserAddressPo.java

@@ -1,79 +0,0 @@
-package com.java110.po.user;
-
-import java.io.Serializable;
-
-/**
- * @ClassName UserAddressPo
- * @Description TODO
- * @Author wuxw
- * @Date 2020/5/30 22:43
- * @Version 1.0
- * add by wuxw 2020/5/30
- **/
-public class UserAddressPo implements Serializable {
-
-    private String id;
-    private String addressId;
-
-    private String userId;
-    private String tel;
-    private String postalCode;
-    private String address;
-    private String isDefault;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getAddressId() {
-        return addressId;
-    }
-
-    public void setAddressId(String addressId) {
-        this.addressId = addressId;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String getTel() {
-        return tel;
-    }
-
-    public void setTel(String tel) {
-        this.tel = tel;
-    }
-
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    public void setPostalCode(String postalCode) {
-        this.postalCode = postalCode;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getIsDefault() {
-        return isDefault;
-    }
-
-    public void setIsDefault(String isDefault) {
-        this.isDefault = isDefault;
-    }
-}

+ 60 - 0
java110-bean/src/main/java/com/java110/po/userAddress/UserAddressPo.java

@@ -0,0 +1,60 @@
+package com.java110.po.userAddress;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UserAddressPo implements Serializable {
+
+    private String areaCode;
+private String isDefault;
+private String address;
+private String tel;
+private String statusCd = "0";
+private String userId;
+private String addressId;
+public String getAreaCode() {
+        return areaCode;
+    }
+public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+public String getIsDefault() {
+        return isDefault;
+    }
+public void setIsDefault(String isDefault) {
+        this.isDefault = isDefault;
+    }
+public String getAddress() {
+        return address;
+    }
+public void setAddress(String address) {
+        this.address = address;
+    }
+public String getTel() {
+        return tel;
+    }
+public void setTel(String tel) {
+        this.tel = tel;
+    }
+public String getStatusCd() {
+        return statusCd;
+    }
+public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+public String getUserId() {
+        return userId;
+    }
+public void setUserId(String userId) {
+        this.userId = userId;
+    }
+public String getAddressId() {
+        return addressId;
+    }
+public void setAddressId(String addressId) {
+        this.addressId = addressId;
+    }
+
+
+
+}

+ 1 - 0
java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -138,6 +138,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_appraiseId = "80";
     public static final String CODE_PREFIX_rentingConfigId = "81";
     public static final String CODE_PREFIX_rentingId = "81";
+    public static final String CODE_PREFIX_addressId = "82";
 
 
 

+ 115 - 0
java110-db/src/main/resources/mapper/user/UserAddressServiceDaoImplMapper.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="userAddressServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存用户联系地址信息 add by wuxw 2018-07-03 -->
+    <insert id="saveUserAddressInfo" parameterType="Map">
+        insert into u_user_address(
+area_code,is_default,address,tel,user_id,address_id
+) values (
+#{areaCode},#{isDefault},#{address},#{tel},#{userId},#{addressId}
+)
+    </insert>
+
+
+
+    <!-- 查询用户联系地址信息 add by wuxw 2018-07-03 -->
+    <select id="getUserAddressInfo" parameterType="Map" resultType="Map">
+        select  t.area_code,t.area_code areaCode,t.is_default,t.is_default isDefault,t.address,t.tel,t.status_cd,t.status_cd statusCd,t.user_id,t.user_id userId,t.address_id,t.address_id addressId 
+from u_user_address t 
+where 1 =1 
+<if test="areaCode !=null and areaCode != ''">
+   and t.area_code= #{areaCode}
+</if> 
+<if test="isDefault !=null and isDefault != ''">
+   and t.is_default= #{isDefault}
+</if> 
+<if test="address !=null and address != ''">
+   and t.address= #{address}
+</if> 
+<if test="tel !=null and tel != ''">
+   and t.tel= #{tel}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="addressId !=null and addressId != ''">
+   and t.address_id= #{addressId}
+</if> 
+order by t.create_time desc
+<if test="page != -1 and page != null ">
+   limit #{page}, #{row}
+</if> 
+
+    </select>
+
+
+
+
+    <!-- 修改用户联系地址信息 add by wuxw 2018-07-03 -->
+    <update id="updateUserAddressInfo" parameterType="Map">
+        update  u_user_address t set t.status_cd = #{statusCd}
+<if test="newBId != null and newBId != ''">
+,t.b_id = #{newBId}
+</if> 
+<if test="areaCode !=null and areaCode != ''">
+, t.area_code= #{areaCode}
+</if> 
+<if test="isDefault !=null and isDefault != ''">
+, t.is_default= #{isDefault}
+</if> 
+<if test="address !=null and address != ''">
+, t.address= #{address}
+</if> 
+<if test="tel !=null and tel != ''">
+, t.tel= #{tel}
+</if> 
+<if test="userId !=null and userId != ''">
+, t.user_id= #{userId}
+</if> 
+ where 1=1 <if test="addressId !=null and addressId != ''">
+and t.address_id= #{addressId}
+</if> 
+
+    </update>
+
+    <!-- 查询用户联系地址数量 add by wuxw 2018-07-03 -->
+     <select id="queryUserAddresssCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from u_user_address t 
+where 1 =1 
+<if test="areaCode !=null and areaCode != ''">
+   and t.area_code= #{areaCode}
+</if> 
+<if test="isDefault !=null and isDefault != ''">
+   and t.is_default= #{isDefault}
+</if> 
+<if test="address !=null and address != ''">
+   and t.address= #{address}
+</if> 
+<if test="tel !=null and tel != ''">
+   and t.tel= #{tel}
+</if> 
+<if test="statusCd !=null and statusCd != ''">
+   and t.status_cd= #{statusCd}
+</if> 
+<if test="userId !=null and userId != ''">
+   and t.user_id= #{userId}
+</if> 
+<if test="addressId !=null and addressId != ''">
+   and t.address_id= #{addressId}
+</if> 
+
+
+     </select>
+
+</mapper>

+ 25 - 27
java110-generator/src/main/resources/newBack/template_1.json

@@ -1,43 +1,41 @@
 {
   "autoMove": true,
-  "id": "cartId",
-  "name": "storeOrderCart",
-  "desc": "订单购物车",
-  "shareParam": "storeId",
-  "shareColumn": "store_id",
-  "shareName": "goods",
-  "tableName": "store_order_cart",
+  "id": "addressId",
+  "name": "userAddress",
+  "desc": "用户联系地址",
+  "shareParam": "userId",
+  "shareColumn": "user_id",
+  "shareName": "user",
+  "tableName": "u_user_address",
   "param": {
-    "cartId": "cart_id",
-    "orderId": "order_id",
-    "productId": "product_id",
-    "valueId": "value_id",
-    "storeId": "store_id",
-    "personId": "person_id",
-    "cartNum": "cart_num",
-    "price": "price",
-    "payPrice": "pay_price",
-    "freightPrice": "freight_price",
-    "remark": "remark",
-    "state": "state",
+    "addressId": "address_id",
+    "userId": "user_id",
+    "tel": "tel",
+    "areaCode": "area_code",
+    "address": "address",
+    "isDefault": "is_default",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "orderId",
-      "msg": "订单不能为空"
+      "code": "userId",
+      "msg": "用户不能为空"
     },
     {
-      "code": "productId",
-      "msg": "产品不能为空"
+      "code": "areaCode",
+      "msg": "地区编码不能为空"
     },
     {
-      "code": "valueId",
-      "msg": "规格不能为空"
+      "code": "tel",
+      "msg": "手机号不能为空"
     },
     {
-      "code": "storeId",
-      "msg": "商户不能为空"
+      "code": "address",
+      "msg": "详细地址不能为空"
+    },
+    {
+      "code": "isDefault",
+      "msg": "默认地址不能为空"
     }
   ]
 }

+ 53 - 0
java110-interface/src/main/java/com/java110/intf/user/IUserAddressInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.userAddress.UserAddressDto;
+import com.java110.po.userAddress.UserAddressPo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.List;
+
+/**
+ * @ClassName IUserAddressInnerServiceSMO
+ * @Description 用户联系地址接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "user-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/userAddressApi")
+public interface IUserAddressInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveUserAddress", method = RequestMethod.POST)
+    public int saveUserAddress(@RequestBody UserAddressPo userAddressPo);
+
+    @RequestMapping(value = "/updateUserAddress", method = RequestMethod.POST)
+    public int updateUserAddress(@RequestBody  UserAddressPo userAddressPo);
+
+    @RequestMapping(value = "/deleteUserAddress", method = RequestMethod.POST)
+    public int deleteUserAddress(@RequestBody  UserAddressPo userAddressPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param userAddressDto 数据对象分享
+     * @return UserAddressDto 对象数据
+     */
+    @RequestMapping(value = "/queryUserAddresss", method = RequestMethod.POST)
+    List<UserAddressDto> queryUserAddresss(@RequestBody UserAddressDto userAddressDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param userAddressDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryUserAddresssCount", method = RequestMethod.POST)
+    int queryUserAddresssCount(@RequestBody UserAddressDto userAddressDto);
+}

+ 117 - 0
service-user/src/main/java/com/java110/user/api/UserAddressApi.java

@@ -0,0 +1,117 @@
+package com.java110.user.api;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.userAddress.UserAddressDto;
+import com.java110.po.userAddress.UserAddressPo;
+import com.java110.user.bmo.userAddress.IDeleteUserAddressBMO;
+import com.java110.user.bmo.userAddress.IGetUserAddressBMO;
+import com.java110.user.bmo.userAddress.ISaveUserAddressBMO;
+import com.java110.user.bmo.userAddress.IUpdateUserAddressBMO;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping(value = "/userAddress")
+public class UserAddressApi {
+
+    @Autowired
+    private ISaveUserAddressBMO saveUserAddressBMOImpl;
+    @Autowired
+    private IUpdateUserAddressBMO updateUserAddressBMOImpl;
+    @Autowired
+    private IDeleteUserAddressBMO deleteUserAddressBMOImpl;
+
+    @Autowired
+    private IGetUserAddressBMO getUserAddressBMOImpl;
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /userAddress/saveUserAddress
+     * @path /app/userAddress/saveUserAddress
+     */
+    @RequestMapping(value = "/saveUserAddress", method = RequestMethod.POST)
+    public ResponseEntity<String> saveUserAddress(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
+        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
+        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
+        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
+        Assert.hasKeyAndValue(reqJson, "isDefault", "请求报文中未包含isDefault");
+
+
+        UserAddressPo userAddressPo = BeanConvertUtil.covertBean(reqJson, UserAddressPo.class);
+        return saveUserAddressBMOImpl.save(userAddressPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /userAddress/updateUserAddress
+     * @path /app/userAddress/updateUserAddress
+     */
+    @RequestMapping(value = "/updateUserAddress", method = RequestMethod.POST)
+    public ResponseEntity<String> updateUserAddress(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "userId", "请求报文中未包含userId");
+        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
+        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
+        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
+        Assert.hasKeyAndValue(reqJson, "isDefault", "请求报文中未包含isDefault");
+        Assert.hasKeyAndValue(reqJson, "addressId", "addressId不能为空");
+
+
+        UserAddressPo userAddressPo = BeanConvertUtil.covertBean(reqJson, UserAddressPo.class);
+        return updateUserAddressBMOImpl.update(userAddressPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /userAddress/deleteUserAddress
+     * @path /app/userAddress/deleteUserAddress
+     */
+    @RequestMapping(value = "/deleteUserAddress", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteUserAddress(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "addressId", "addressId不能为空");
+
+
+        UserAddressPo userAddressPo = BeanConvertUtil.covertBean(reqJson, UserAddressPo.class);
+        return deleteUserAddressBMOImpl.delete(userAddressPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param userId 用户ID
+     * @return
+     * @serviceCode /userAddress/queryUserAddress
+     * @path /app/userAddress/queryUserAddress
+     */
+    @RequestMapping(value = "/queryUserAddress", method = RequestMethod.GET)
+    public ResponseEntity<String> queryUserAddress(@RequestParam(value = "userId") String userId,
+                                                   @RequestParam(value = "page") int page,
+                                                   @RequestParam(value = "row") int row) {
+        UserAddressDto userAddressDto = new UserAddressDto();
+        userAddressDto.setPage(page);
+        userAddressDto.setRow(row);
+        userAddressDto.setUserId(userId);
+        return getUserAddressBMOImpl.get(userAddressDto);
+    }
+}

+ 17 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/IDeleteUserAddressBMO.java

@@ -0,0 +1,17 @@
+package com.java110.user.bmo.userAddress;
+import com.java110.po.userAddress.UserAddressPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteUserAddressBMO {
+
+
+    /**
+     * 修改用户联系地址
+     * add by wuxw
+     * @param userAddressPo
+     * @return
+     */
+    ResponseEntity<String> delete(UserAddressPo userAddressPo);
+
+
+}

+ 16 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/IGetUserAddressBMO.java

@@ -0,0 +1,16 @@
+package com.java110.user.bmo.userAddress;
+import com.java110.dto.userAddress.UserAddressDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetUserAddressBMO {
+
+
+    /**
+     * 查询用户联系地址
+     * add by wuxw
+     * @param  userAddressDto
+     * @return
+     */
+    ResponseEntity<String> get(UserAddressDto userAddressDto);
+
+
+}

+ 17 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/ISaveUserAddressBMO.java

@@ -0,0 +1,17 @@
+package com.java110.user.bmo.userAddress;
+
+import com.java110.po.userAddress.UserAddressPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveUserAddressBMO {
+
+
+    /**
+     * 添加用户联系地址
+     * add by wuxw
+     * @param userAddressPo
+     * @return
+     */
+    ResponseEntity<String> save(UserAddressPo userAddressPo);
+
+
+}

+ 19 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/IUpdateUserAddressBMO.java

@@ -0,0 +1,19 @@
+package com.java110.user.bmo.userAddress;
+
+import com.java110.po.userAddress.UserAddressPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateUserAddressBMO {
+
+
+    /**
+     * 修改用户联系地址
+     * add by wuxw
+     *
+     * @param userAddressPo
+     * @return
+     */
+    ResponseEntity<String> update(UserAddressPo userAddressPo);
+
+
+}

+ 34 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/impl/DeleteUserAddressBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.user.bmo.userAddress.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.IUserAddressInnerServiceSMO;
+import com.java110.po.userAddress.UserAddressPo;
+import com.java110.user.bmo.userAddress.IDeleteUserAddressBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteUserAddressBMOImpl")
+public class DeleteUserAddressBMOImpl implements IDeleteUserAddressBMO {
+
+    @Autowired
+    private IUserAddressInnerServiceSMO userAddressInnerServiceSMOImpl;
+
+    /**
+     * @param userAddressPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(UserAddressPo userAddressPo) {
+
+        int flag = userAddressInnerServiceSMOImpl.deleteUserAddress(userAddressPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 44 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/impl/GetUserAddressBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.user.bmo.userAddress.impl;
+
+import com.java110.dto.userAddress.UserAddressDto;
+import com.java110.intf.IUserAddressInnerServiceSMO;
+import com.java110.user.bmo.userAddress.IGetUserAddressBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("getUserAddressBMOImpl")
+public class GetUserAddressBMOImpl implements IGetUserAddressBMO {
+
+    @Autowired
+    private IUserAddressInnerServiceSMO userAddressInnerServiceSMOImpl;
+
+    /**
+     * @param userAddressDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(UserAddressDto userAddressDto) {
+
+
+        int count = userAddressInnerServiceSMOImpl.queryUserAddresssCount(userAddressDto);
+
+        List<UserAddressDto> userAddressDtos = null;
+        if (count > 0) {
+            userAddressDtos = userAddressInnerServiceSMOImpl.queryUserAddresss(userAddressDto);
+        } else {
+            userAddressDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) userAddressDto.getRow()), count, userAddressDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

+ 38 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/impl/SaveUserAddressBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.user.bmo.userAddress.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.intf.IUserAddressInnerServiceSMO;
+import com.java110.po.userAddress.UserAddressPo;
+import com.java110.user.bmo.userAddress.ISaveUserAddressBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveUserAddressBMOImpl")
+public class SaveUserAddressBMOImpl implements ISaveUserAddressBMO {
+
+    @Autowired
+    private IUserAddressInnerServiceSMO userAddressInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param userAddressPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(UserAddressPo userAddressPo) {
+
+        userAddressPo.setAddressId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_addressId));
+        int flag = userAddressInnerServiceSMOImpl.saveUserAddress(userAddressPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 34 - 0
service-user/src/main/java/com/java110/user/bmo/userAddress/impl/UpdateUserAddressBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.user.bmo.userAddress.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.intf.IUserAddressInnerServiceSMO;
+import com.java110.po.userAddress.UserAddressPo;
+import com.java110.user.bmo.userAddress.IUpdateUserAddressBMO;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateUserAddressBMOImpl")
+public class UpdateUserAddressBMOImpl implements IUpdateUserAddressBMO {
+
+    @Autowired
+    private IUserAddressInnerServiceSMO userAddressInnerServiceSMOImpl;
+
+    /**
+     * @param userAddressPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(UserAddressPo userAddressPo) {
+
+        int flag = userAddressInnerServiceSMOImpl.updateUserAddress(userAddressPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

+ 61 - 0
service-user/src/main/java/com/java110/user/dao/IUserAddressServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.user.dao;
+
+
+import com.java110.utils.exception.DAOException;
+import com.java110.entity.merchant.BoMerchant;
+import com.java110.entity.merchant.BoMerchantAttr;
+import com.java110.entity.merchant.Merchant;
+import com.java110.entity.merchant.MerchantAttr;
+
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户联系地址组件内部之间使用,没有给外围系统提供服务能力
+ * 用户联系地址服务接口类,要求全部以字符串传输,方便微服务化
+ * 新建客户,修改客户,删除客户,查询客户等功能
+ *
+ * Created by wuxw on 2016/12/27.
+ */
+public interface IUserAddressServiceDao {
+
+
+    /**
+     * 保存 用户联系地址信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveUserAddressInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询用户联系地址信息(instance过程)
+     * 根据bId 查询用户联系地址信息
+     * @param info bId 信息
+     * @return 用户联系地址信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getUserAddressInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改用户联系地址信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateUserAddressInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询用户联系地址总数
+     *
+     * @param info 用户联系地址信息
+     * @return 用户联系地址数量
+     */
+    int queryUserAddresssCount(Map info);
+
+}

+ 98 - 0
service-user/src/main/java/com/java110/user/dao/impl/UserAddressServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.user.dao.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.DAOException;
+import com.java110.utils.util.DateUtil;
+import com.java110.core.base.dao.BaseServiceDao;
+import com.java110.user.dao.IUserAddressServiceDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户联系地址服务 与数据库交互
+ * Created by wuxw on 2017/4/5.
+ */
+@Service("userAddressServiceDaoImpl")
+//@Transactional
+public class UserAddressServiceDaoImpl extends BaseServiceDao implements IUserAddressServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(UserAddressServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存用户联系地址信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveUserAddressInfo(Map info) throws DAOException {
+        logger.debug("保存用户联系地址信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("userAddressServiceDaoImpl.saveUserAddressInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存用户联系地址信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+
+    /**
+     * 查询用户联系地址信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getUserAddressInfo(Map info) throws DAOException {
+        logger.debug("查询用户联系地址信息 入参 info : {}",info);
+
+        List<Map> businessUserAddressInfos = sqlSessionTemplate.selectList("userAddressServiceDaoImpl.getUserAddressInfo",info);
+
+        return businessUserAddressInfos;
+    }
+
+
+    /**
+     * 修改用户联系地址信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateUserAddressInfo(Map info) throws DAOException {
+        logger.debug("修改用户联系地址信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("userAddressServiceDaoImpl.updateUserAddressInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改用户联系地址信息Instance数据失败:"+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询用户联系地址数量
+     * @param info 用户联系地址信息
+     * @return 用户联系地址数量
+     */
+    @Override
+    public int queryUserAddresssCount(Map info) {
+        logger.debug("查询用户联系地址数据 入参 info : {}",info);
+
+        List<Map> businessUserAddressInfos = sqlSessionTemplate.selectList("userAddressServiceDaoImpl.queryUserAddresssCount", info);
+        if (businessUserAddressInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessUserAddressInfos.get(0).get("count").toString());
+    }
+
+
+}

+ 2 - 2
service-user/src/main/java/com/java110/user/listener/SaveUserAddressListener.java

@@ -3,9 +3,9 @@ package com.java110.user.listener;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Listener;
 import com.java110.core.context.DataFlowContext;
-import com.java110.entity.center.Business;
 import com.java110.core.event.service.AbstractBusinessServiceDataFlowListener;
-import com.java110.po.user.UserAddressPo;
+import com.java110.entity.center.Business;
+import com.java110.po.userAddress.UserAddressPo;
 import com.java110.user.dao.IUserServiceDao;
 import com.java110.utils.constant.BusinessTypeConstant;
 import com.java110.utils.constant.ResponseConstant;

+ 83 - 0
service-user/src/main/java/com/java110/user/smo/impl/UserAddressInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.user.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.userAddress.UserAddressDto;
+import com.java110.intf.IUserAddressInnerServiceSMO;
+import com.java110.po.userAddress.UserAddressPo;
+import com.java110.user.dao.IUserAddressServiceDao;
+import com.java110.utils.util.BeanConvertUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName FloorInnerServiceSMOImpl
+ * @Description 用户联系地址内部服务实现类
+ * @Author wuxw
+ * @Date 2019/4/24 9:20
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@RestController
+public class UserAddressInnerServiceSMOImpl extends BaseServiceSMO implements IUserAddressInnerServiceSMO {
+
+    @Autowired
+    private IUserAddressServiceDao userAddressServiceDaoImpl;
+
+
+    @Override
+    public int saveUserAddress(@RequestBody UserAddressPo userAddressPo) {
+        int saveFlag = 1;
+        userAddressServiceDaoImpl.saveUserAddressInfo(BeanConvertUtil.beanCovertMap(userAddressPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateUserAddress(@RequestBody UserAddressPo userAddressPo) {
+        int saveFlag = 1;
+        userAddressServiceDaoImpl.updateUserAddressInfo(BeanConvertUtil.beanCovertMap(userAddressPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteUserAddress(@RequestBody UserAddressPo userAddressPo) {
+        int saveFlag = 1;
+        userAddressPo.setStatusCd("1");
+        userAddressServiceDaoImpl.updateUserAddressInfo(BeanConvertUtil.beanCovertMap(userAddressPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<UserAddressDto> queryUserAddresss(@RequestBody UserAddressDto userAddressDto) {
+
+        //校验是否传了 分页信息
+
+        int page = userAddressDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            userAddressDto.setPage((page - 1) * userAddressDto.getRow());
+        }
+
+        List<UserAddressDto> userAddresss = BeanConvertUtil.covertBeanList(userAddressServiceDaoImpl.getUserAddressInfo(BeanConvertUtil.beanCovertMap(userAddressDto)), UserAddressDto.class);
+
+        return userAddresss;
+    }
+
+
+    @Override
+    public int queryUserAddresssCount(@RequestBody UserAddressDto userAddressDto) {
+        return userAddressServiceDaoImpl.queryUserAddresssCount(BeanConvertUtil.beanCovertMap(userAddressDto));
+    }
+
+    public IUserAddressServiceDao getUserAddressServiceDaoImpl() {
+        return userAddressServiceDaoImpl;
+    }
+
+    public void setUserAddressServiceDaoImpl(IUserAddressServiceDao userAddressServiceDaoImpl) {
+        this.userAddressServiceDaoImpl = userAddressServiceDaoImpl;
+    }
+}