加入订单联系地址

java110-bean/src/main/java/com/java110/dto/storeOrderAddress/StoreOrderAddressDto.java

@@ -0,0 +1,90 @@
+package com.java110.dto.storeOrderAddress;
+
+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 StoreOrderAddressDto extends PageDto implements Serializable {
+
+    private String areaCode;
+private String address;
+private String orderId;
+private String tel;
+private String oaId;
+private String addressId;
+private String username;
+
+
+    private Date createTime;
+
+    private String statusCd = "0";
+
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+public String getAddress() {
+        return address;
+    }
+public void setAddress(String address) {
+        this.address = address;
+    }
+public String getOrderId() {
+        return orderId;
+    }
+public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+public String getTel() {
+        return tel;
+    }
+public void setTel(String tel) {
+        this.tel = tel;
+    }
+public String getOaId() {
+        return oaId;
+    }
+public void setOaId(String oaId) {
+        this.oaId = oaId;
+    }
+public String getAddressId() {
+        return addressId;
+    }
+public void setAddressId(String addressId) {
+        this.addressId = addressId;
+    }
+public String getUsername() {
+        return username;
+    }
+public void setUsername(String username) {
+        this.username = username;
+    }
+
+
+    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;
+    }
+}

java110-bean/src/main/java/com/java110/po/storeOrderAddress/StoreOrderAddressPo.java

@@ -0,0 +1,81 @@
+package com.java110.po.storeOrderAddress;
+
+import java.io.Serializable;
+
+public class StoreOrderAddressPo implements Serializable {
+
+    private String areaCode;
+    private String address;
+    private String orderId;
+    private String tel;
+    private String statusCd = "0";
+    private String oaId;
+    private String addressId;
+    private String username;
+
+    public String getAreaCode() {
+        return areaCode;
+    }
+
+    public void setAreaCode(String areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    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 getOaId() {
+        return oaId;
+    }
+
+    public void setOaId(String oaId) {
+        this.oaId = oaId;
+    }
+
+    public String getAddressId() {
+        return addressId;
+    }
+
+    public void setAddressId(String addressId) {
+        this.addressId = addressId;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+
+}

java110-core/src/main/java/com/java110/core/factory/GenerateCodeFactory.java

@@ -166,6 +166,7 @@ public class GenerateCodeFactory {
     public static final String CODE_PREFIX_labelId = "94";
     public static final String CODE_PREFIX_cartId = "95";
     public static final String CODE_PREFIX_orderId = "96";
+    public static final String CODE_PREFIX_oaId = "97";
 
 
 

java110-db/src/main/resources/mapper/goods/StoreOrderAddressServiceDaoImplMapper.xml

@@ -0,0 +1,124 @@
+<?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="storeOrderAddressServiceDaoImpl">
+
+
+
+
+
+    <!-- 保存发货地址信息 add by wuxw 2018-07-03 -->
+    <insert id="saveStoreOrderAddressInfo" parameterType="Map">
+        insert into store_order_address(
+area_code,address,order_id,tel,oa_id,address_id,username
+) values (
+#{areaCode},#{address},#{orderId},#{tel},#{oaId},#{addressId},#{username}
+)
+    </insert>
+
+
+
+    <!-- 查询发货地址信息 add by wuxw 2018-07-03 -->
+    <select id="getStoreOrderAddressInfo" parameterType="Map" resultType="Map">
+        select  t.area_code,t.area_code areaCode,t.address,t.order_id,t.order_id orderId,t.tel,t.status_cd,t.status_cd statusCd,t.oa_id,t.oa_id oaId,t.address_id,t.address_id addressId,t.username 
+from store_order_address t 
+where 1 =1 
+<if test="areaCode !=null and areaCode != ''">
+   and t.area_code= #{areaCode}
+</if> 
+<if test="address !=null and address != ''">
+   and t.address= #{address}
+</if> 
+<if test="orderId !=null and orderId != ''">
+   and t.order_id= #{orderId}
+</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="oaId !=null and oaId != ''">
+   and t.oa_id= #{oaId}
+</if> 
+<if test="addressId !=null and addressId != ''">
+   and t.address_id= #{addressId}
+</if> 
+<if test="username !=null and username != ''">
+   and t.username= #{username}
+</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="updateStoreOrderAddressInfo" parameterType="Map">
+        update  store_order_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="address !=null and address != ''">
+, t.address= #{address}
+</if> 
+<if test="orderId !=null and orderId != ''">
+, t.order_id= #{orderId}
+</if> 
+<if test="tel !=null and tel != ''">
+, t.tel= #{tel}
+</if> 
+<if test="addressId !=null and addressId != ''">
+, t.address_id= #{addressId}
+</if> 
+<if test="username !=null and username != ''">
+, t.username= #{username}
+</if> 
+ where 1=1 <if test="oaId !=null and oaId != ''">
+and t.oa_id= #{oaId}
+</if> 
+
+    </update>
+
+    <!-- 查询发货地址数量 add by wuxw 2018-07-03 -->
+     <select id="queryStoreOrderAddresssCount" parameterType="Map" resultType="Map">
+        select  count(1) count 
+from store_order_address t 
+where 1 =1 
+<if test="areaCode !=null and areaCode != ''">
+   and t.area_code= #{areaCode}
+</if> 
+<if test="address !=null and address != ''">
+   and t.address= #{address}
+</if> 
+<if test="orderId !=null and orderId != ''">
+   and t.order_id= #{orderId}
+</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="oaId !=null and oaId != ''">
+   and t.oa_id= #{oaId}
+</if> 
+<if test="addressId !=null and addressId != ''">
+   and t.address_id= #{addressId}
+</if> 
+<if test="username !=null and username != ''">
+   and t.username= #{username}
+</if> 
+
+
+     </select>
+
+</mapper>

java110-generator/src/main/resources/newBack/template_1.json

@@ -1,25 +1,26 @@
 {
   "autoMove": true,
-  "id": "addressId",
-  "name": "userAddress",
-  "desc": "用户联系地址",
-  "shareParam": "userId",
-  "shareColumn": "user_id",
-  "shareName": "user",
-  "tableName": "u_user_address",
+  "id": "oaId",
+  "name": "storeOrderAddress",
+  "desc": "发货地址",
+  "shareParam": "orderId",
+  "shareColumn": "order_id",
+  "shareName": "goods",
+  "tableName": "store_order_address",
   "param": {
+    "oaId": "oa_id",
     "addressId": "address_id",
-    "userId": "user_id",
+    "orderId": "order_id",
     "tel": "tel",
     "areaCode": "area_code",
     "address": "address",
-    "isDefault": "is_default",
+    "username": "username",
     "statusCd": "status_cd"
   },
   "required": [
     {
-      "code": "userId",
-      "msg": "用户不能为空"
+      "code": "orderId",
+      "msg": "订单不能为空"
     },
     {
       "code": "areaCode",
@@ -34,8 +35,8 @@
       "msg": "详细地址不能为空"
     },
     {
-      "code": "isDefault",
-      "msg": "默认地址不能为空"
+      "code": "username",
+      "msg": "收货人不能为空"
     }
   ]
 }

java110-interface/src/main/java/com/java110/intf/goods/IStoreOrderAddressInnerServiceSMO.java

@@ -0,0 +1,53 @@
+package com.java110.intf;
+
+import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+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 IStoreOrderAddressInnerServiceSMO
+ * @Description 发货地址接口类
+ * @Author wuxw
+ * @Date 2019/4/24 9:04
+ * @Version 1.0
+ * add by wuxw 2019/4/24
+ **/
+@FeignClient(name = "goods-service", configuration = {FeignConfiguration.class})
+@RequestMapping("/storeOrderAddressApi")
+public interface IStoreOrderAddressInnerServiceSMO {
+
+
+    @RequestMapping(value = "/saveStoreOrderAddress", method = RequestMethod.POST)
+    public int saveStoreOrderAddress(@RequestBody StoreOrderAddressPo storeOrderAddressPo);
+
+    @RequestMapping(value = "/updateStoreOrderAddress", method = RequestMethod.POST)
+    public int updateStoreOrderAddress(@RequestBody  StoreOrderAddressPo storeOrderAddressPo);
+
+    @RequestMapping(value = "/deleteStoreOrderAddress", method = RequestMethod.POST)
+    public int deleteStoreOrderAddress(@RequestBody  StoreOrderAddressPo storeOrderAddressPo);
+
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param storeOrderAddressDto 数据对象分享
+     * @return StoreOrderAddressDto 对象数据
+     */
+    @RequestMapping(value = "/queryStoreOrderAddresss", method = RequestMethod.POST)
+    List<StoreOrderAddressDto> queryStoreOrderAddresss(@RequestBody StoreOrderAddressDto storeOrderAddressDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param storeOrderAddressDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryStoreOrderAddresssCount", method = RequestMethod.POST)
+    int queryStoreOrderAddresssCount(@RequestBody StoreOrderAddressDto storeOrderAddressDto);
+}

service-goods/src/main/java/com/java110/goods/api/StoreOrderApi.java

@@ -3,6 +3,7 @@ package com.java110.goods.api;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.storeCart.StoreCartDto;
 import com.java110.dto.storeOrder.StoreOrderDto;
+import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
 import com.java110.dto.storeOrderCart.StoreOrderCartDto;
 import com.java110.goods.bmo.storeCart.IDeleteStoreCartBMO;
 import com.java110.goods.bmo.storeCart.IGetStoreCartBMO;
@@ -12,23 +13,31 @@ import com.java110.goods.bmo.storeOrder.IDeleteStoreOrderBMO;
 import com.java110.goods.bmo.storeOrder.IGetStoreOrderBMO;
 import com.java110.goods.bmo.storeOrder.ISaveStoreOrderBMO;
 import com.java110.goods.bmo.storeOrder.IUpdateStoreOrderBMO;
+import com.java110.goods.bmo.storeOrderAddress.IDeleteStoreOrderAddressBMO;
+import com.java110.goods.bmo.storeOrderAddress.IGetStoreOrderAddressBMO;
+import com.java110.goods.bmo.storeOrderAddress.ISaveStoreOrderAddressBMO;
+import com.java110.goods.bmo.storeOrderAddress.IUpdateStoreOrderAddressBMO;
 import com.java110.goods.bmo.storeOrderCart.IDeleteStoreOrderCartBMO;
 import com.java110.goods.bmo.storeOrderCart.IGetStoreOrderCartBMO;
 import com.java110.goods.bmo.storeOrderCart.ISaveStoreOrderCartBMO;
 import com.java110.goods.bmo.storeOrderCart.IUpdateStoreOrderCartBMO;
 import com.java110.po.storeCart.StoreCartPo;
 import com.java110.po.storeOrder.StoreOrderPo;
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
 import com.java110.po.storeOrderCart.StoreOrderCartPo;
 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.*;
+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;
 
 /**
  * 商户订单
  * add by wuxw 2020-11-15
- *
  */
 @RestController
 @RequestMapping(value = "/storeOrder")
@@ -66,6 +75,17 @@ public class StoreOrderApi {
     @Autowired
     private IGetStoreOrderCartBMO getStoreOrderCartBMOImpl;
 
+
+    @Autowired
+    private ISaveStoreOrderAddressBMO saveStoreOrderAddressBMOImpl;
+    @Autowired
+    private IUpdateStoreOrderAddressBMO updateStoreOrderAddressBMOImpl;
+    @Autowired
+    private IDeleteStoreOrderAddressBMO deleteStoreOrderAddressBMOImpl;
+
+    @Autowired
+    private IGetStoreOrderAddressBMO getStoreOrderAddressBMOImpl;
+
     /**
      * 微信保存消息模板
      *
@@ -82,7 +102,7 @@ public class StoreOrderApi {
         Assert.hasKey(reqJson, "goodsList", "未包含商品信息");
 
         StoreOrderPo storeOrderPo = BeanConvertUtil.covertBean(reqJson, StoreOrderPo.class);
-        return saveStoreOrderBMOImpl.save(storeOrderPo,reqJson.getJSONArray("goodsList"));
+        return saveStoreOrderBMOImpl.save(storeOrderPo, reqJson.getJSONArray("goodsList"));
     }
 
     /**
@@ -209,7 +229,7 @@ public class StoreOrderApi {
      * @path /app/storeOrder/queryStoreCart
      */
     @RequestMapping(value = "/queryStoreCart", method = RequestMethod.GET)
-    public ResponseEntity<String> queryStoreCart(@RequestParam(value = "personId",required = false) String personId,
+    public ResponseEntity<String> queryStoreCart(@RequestParam(value = "personId", required = false) String personId,
                                                  @RequestParam(value = "page") int page,
                                                  @RequestParam(value = "row") int row) {
         StoreCartDto storeCartDto = new StoreCartDto();
@@ -298,4 +318,88 @@ public class StoreOrderApi {
         storeOrderCartDto.setRow(row);
         return getStoreOrderCartBMOImpl.get(storeOrderCartDto);
     }
+
+
+    /**
+     * 微信保存消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /storeOrder/saveStoreOrderAddress
+     * @path /app/storeOrder/saveStoreOrderAddress
+     */
+    @RequestMapping(value = "/saveStoreOrderAddress", method = RequestMethod.POST)
+    public ResponseEntity<String> saveStoreOrderAddress(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
+        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
+        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
+        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
+        Assert.hasKeyAndValue(reqJson, "username", "请求报文中未包含username");
+
+
+        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
+        return saveStoreOrderAddressBMOImpl.save(storeOrderAddressPo);
+    }
+
+    /**
+     * 微信修改消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /storeOrder/updateStoreOrderAddress
+     * @path /app/storeOrder/updateStoreOrderAddress
+     */
+    @RequestMapping(value = "/updateStoreOrderAddress", method = RequestMethod.POST)
+    public ResponseEntity<String> updateStoreOrderAddress(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "orderId", "请求报文中未包含orderId");
+        Assert.hasKeyAndValue(reqJson, "areaCode", "请求报文中未包含areaCode");
+        Assert.hasKeyAndValue(reqJson, "tel", "请求报文中未包含tel");
+        Assert.hasKeyAndValue(reqJson, "address", "请求报文中未包含address");
+        Assert.hasKeyAndValue(reqJson, "username", "请求报文中未包含username");
+        Assert.hasKeyAndValue(reqJson, "oaId", "oaId不能为空");
+
+
+        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
+        return updateStoreOrderAddressBMOImpl.update(storeOrderAddressPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /storeOrder/deleteStoreOrderAddress
+     * @path /app/storeOrder/deleteStoreOrderAddress
+     */
+    @RequestMapping(value = "/deleteStoreOrderAddress", method = RequestMethod.POST)
+    public ResponseEntity<String> deleteStoreOrderAddress(@RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+        Assert.hasKeyAndValue(reqJson, "oaId", "oaId不能为空");
+
+
+        StoreOrderAddressPo storeOrderAddressPo = BeanConvertUtil.covertBean(reqJson, StoreOrderAddressPo.class);
+        return deleteStoreOrderAddressBMOImpl.delete(storeOrderAddressPo);
+    }
+
+    /**
+     * 微信删除消息模板
+     *
+     * @param orderId 订单ID
+     * @return
+     * @serviceCode /storeOrder/queryStoreOrderAddress
+     * @path /app/storeOrder/queryStoreOrderAddress
+     */
+    @RequestMapping(value = "/queryStoreOrderAddress", method = RequestMethod.GET)
+    public ResponseEntity<String> queryStoreOrderAddress(@RequestParam(value = "orderId") String orderId,
+                                                         @RequestParam(value = "page") int page,
+                                                         @RequestParam(value = "row") int row) {
+        StoreOrderAddressDto storeOrderAddressDto = new StoreOrderAddressDto();
+        storeOrderAddressDto.setPage(page);
+        storeOrderAddressDto.setRow(row);
+        storeOrderAddressDto.setOrderId(orderId);
+        return getStoreOrderAddressBMOImpl.get(storeOrderAddressDto);
+    }
 }

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/IDeleteStoreOrderAddressBMO.java

@@ -0,0 +1,17 @@
+package com.java110.goods.bmo.storeOrderAddress;
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IDeleteStoreOrderAddressBMO {
+
+
+    /**
+     * 修改发货地址
+     * add by wuxw
+     * @param storeOrderAddressPo
+     * @return
+     */
+    ResponseEntity<String> delete(StoreOrderAddressPo storeOrderAddressPo);
+
+
+}

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/IGetStoreOrderAddressBMO.java

@@ -0,0 +1,16 @@
+package com.java110.goods.bmo.storeOrderAddress;
+import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
+import org.springframework.http.ResponseEntity;
+public interface IGetStoreOrderAddressBMO {
+
+
+    /**
+     * 查询发货地址
+     * add by wuxw
+     * @param  storeOrderAddressDto
+     * @return
+     */
+    ResponseEntity<String> get(StoreOrderAddressDto storeOrderAddressDto);
+
+
+}

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/ISaveStoreOrderAddressBMO.java

@@ -0,0 +1,17 @@
+package com.java110.goods.bmo.storeOrderAddress;
+
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+import org.springframework.http.ResponseEntity;
+public interface ISaveStoreOrderAddressBMO {
+
+
+    /**
+     * 添加发货地址
+     * add by wuxw
+     * @param storeOrderAddressPo
+     * @return
+     */
+    ResponseEntity<String> save(StoreOrderAddressPo storeOrderAddressPo);
+
+
+}

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/IUpdateStoreOrderAddressBMO.java

@@ -0,0 +1,19 @@
+package com.java110.goods.bmo.storeOrderAddress;
+
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+import org.springframework.http.ResponseEntity;
+
+public interface IUpdateStoreOrderAddressBMO {
+
+
+    /**
+     * 修改发货地址
+     * add by wuxw
+     *
+     * @param storeOrderAddressPo
+     * @return
+     */
+    ResponseEntity<String> update(StoreOrderAddressPo storeOrderAddressPo);
+
+
+}

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/impl/DeleteStoreOrderAddressBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.goods.bmo.storeOrderAddress.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.goods.bmo.storeOrderAddress.IDeleteStoreOrderAddressBMO;
+import com.java110.intf.IStoreOrderAddressInnerServiceSMO;
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("deleteStoreOrderAddressBMOImpl")
+public class DeleteStoreOrderAddressBMOImpl implements IDeleteStoreOrderAddressBMO {
+
+    @Autowired
+    private IStoreOrderAddressInnerServiceSMO storeOrderAddressInnerServiceSMOImpl;
+
+    /**
+     * @param storeOrderAddressPo 数据
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> delete(StoreOrderAddressPo storeOrderAddressPo) {
+
+        int flag = storeOrderAddressInnerServiceSMOImpl.deleteStoreOrderAddress(storeOrderAddressPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/impl/GetStoreOrderAddressBMOImpl.java

@@ -0,0 +1,44 @@
+package com.java110.goods.bmo.storeOrderAddress.impl;
+
+import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
+import com.java110.goods.bmo.storeOrderAddress.IGetStoreOrderAddressBMO;
+import com.java110.intf.IStoreOrderAddressInnerServiceSMO;
+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("getStoreOrderAddressBMOImpl")
+public class GetStoreOrderAddressBMOImpl implements IGetStoreOrderAddressBMO {
+
+    @Autowired
+    private IStoreOrderAddressInnerServiceSMO storeOrderAddressInnerServiceSMOImpl;
+
+    /**
+     * @param storeOrderAddressDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> get(StoreOrderAddressDto storeOrderAddressDto) {
+
+
+        int count = storeOrderAddressInnerServiceSMOImpl.queryStoreOrderAddresssCount(storeOrderAddressDto);
+
+        List<StoreOrderAddressDto> storeOrderAddressDtos = null;
+        if (count > 0) {
+            storeOrderAddressDtos = storeOrderAddressInnerServiceSMOImpl.queryStoreOrderAddresss(storeOrderAddressDto);
+        } else {
+            storeOrderAddressDtos = new ArrayList<>();
+        }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) storeOrderAddressDto.getRow()), count, storeOrderAddressDtos);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        return responseEntity;
+    }
+
+}

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/impl/SaveStoreOrderAddressBMOImpl.java

@@ -0,0 +1,38 @@
+package com.java110.goods.bmo.storeOrderAddress.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.goods.bmo.storeOrderAddress.ISaveStoreOrderAddressBMO;
+import com.java110.intf.IStoreOrderAddressInnerServiceSMO;
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("saveStoreOrderAddressBMOImpl")
+public class SaveStoreOrderAddressBMOImpl implements ISaveStoreOrderAddressBMO {
+
+    @Autowired
+    private IStoreOrderAddressInnerServiceSMO storeOrderAddressInnerServiceSMOImpl;
+
+    /**
+     * 添加小区信息
+     *
+     * @param storeOrderAddressPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> save(StoreOrderAddressPo storeOrderAddressPo) {
+
+        storeOrderAddressPo.setOaId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_oaId));
+        int flag = storeOrderAddressInnerServiceSMOImpl.saveStoreOrderAddress(storeOrderAddressPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-goods/src/main/java/com/java110/goods/bmo/storeOrderAddress/impl/UpdateStoreOrderAddressBMOImpl.java

@@ -0,0 +1,34 @@
+package com.java110.goods.bmo.storeOrderAddress.impl;
+
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.goods.bmo.storeOrderAddress.IUpdateStoreOrderAddressBMO;
+import com.java110.intf.IStoreOrderAddressInnerServiceSMO;
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+
+@Service("updateStoreOrderAddressBMOImpl")
+public class UpdateStoreOrderAddressBMOImpl implements IUpdateStoreOrderAddressBMO {
+
+    @Autowired
+    private IStoreOrderAddressInnerServiceSMO storeOrderAddressInnerServiceSMOImpl;
+
+    /**
+     * @param storeOrderAddressPo
+     * @return 订单服务能够接受的报文
+     */
+    @Java110Transactional
+    public ResponseEntity<String> update(StoreOrderAddressPo storeOrderAddressPo) {
+
+        int flag = storeOrderAddressInnerServiceSMOImpl.updateStoreOrderAddress(storeOrderAddressPo);
+
+        if (flag > 0) {
+            return ResultVo.createResponseEntity(ResultVo.CODE_OK, "保存成功");
+        }
+
+        return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "保存失败");
+    }
+
+}

service-goods/src/main/java/com/java110/goods/dao/IStoreOrderAddressServiceDao.java

@@ -0,0 +1,61 @@
+package com.java110.goods.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 IStoreOrderAddressServiceDao {
+
+
+    /**
+     * 保存 发货地址信息
+     * @param info
+     * @throws DAOException DAO异常
+     */
+    void saveStoreOrderAddressInfo(Map info) throws DAOException;
+
+
+
+
+    /**
+     * 查询发货地址信息（instance过程）
+     * 根据bId 查询发货地址信息
+     * @param info bId 信息
+     * @return 发货地址信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getStoreOrderAddressInfo(Map info) throws DAOException;
+
+
+
+    /**
+     * 修改发货地址信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    void updateStoreOrderAddressInfo(Map info) throws DAOException;
+
+
+    /**
+     * 查询发货地址总数
+     *
+     * @param info 发货地址信息
+     * @return 发货地址数量
+     */
+    int queryStoreOrderAddresssCount(Map info);
+
+}

service-goods/src/main/java/com/java110/goods/dao/impl/StoreOrderAddressServiceDaoImpl.java

@@ -0,0 +1,98 @@
+package com.java110.goods.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.goods.dao.IStoreOrderAddressServiceDao;
+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("storeOrderAddressServiceDaoImpl")
+//@Transactional
+public class StoreOrderAddressServiceDaoImpl extends BaseServiceDao implements IStoreOrderAddressServiceDao {
+
+    private static Logger logger = LoggerFactory.getLogger(StoreOrderAddressServiceDaoImpl.class);
+
+
+
+
+
+    /**
+     * 保存发货地址信息 到 instance
+     * @param info   bId 信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void saveStoreOrderAddressInfo(Map info) throws DAOException {
+        logger.debug("保存发货地址信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.insert("storeOrderAddressServiceDaoImpl.saveStoreOrderAddressInfo",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> getStoreOrderAddressInfo(Map info) throws DAOException {
+        logger.debug("查询发货地址信息 入参 info : {}",info);
+
+        List<Map> businessStoreOrderAddressInfos = sqlSessionTemplate.selectList("storeOrderAddressServiceDaoImpl.getStoreOrderAddressInfo",info);
+
+        return businessStoreOrderAddressInfos;
+    }
+
+
+    /**
+     * 修改发货地址信息
+     * @param info 修改信息
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public void updateStoreOrderAddressInfo(Map info) throws DAOException {
+        logger.debug("修改发货地址信息Instance 入参 info : {}",info);
+
+        int saveFlag = sqlSessionTemplate.update("storeOrderAddressServiceDaoImpl.updateStoreOrderAddressInfo",info);
+
+        if(saveFlag < 1){
+            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改发货地址信息Instance数据失败："+ JSONObject.toJSONString(info));
+        }
+    }
+
+     /**
+     * 查询发货地址数量
+     * @param info 发货地址信息
+     * @return 发货地址数量
+     */
+    @Override
+    public int queryStoreOrderAddresssCount(Map info) {
+        logger.debug("查询发货地址数据 入参 info : {}",info);
+
+        List<Map> businessStoreOrderAddressInfos = sqlSessionTemplate.selectList("storeOrderAddressServiceDaoImpl.queryStoreOrderAddresssCount", info);
+        if (businessStoreOrderAddressInfos.size() < 1) {
+            return 0;
+        }
+
+        return Integer.parseInt(businessStoreOrderAddressInfos.get(0).get("count").toString());
+    }
+
+
+}

service-goods/src/main/java/com/java110/goods/smo/impl/StoreOrderAddressInnerServiceSMOImpl.java

@@ -0,0 +1,83 @@
+package com.java110.goods.smo.impl;
+
+
+import com.java110.core.base.smo.BaseServiceSMO;
+import com.java110.dto.PageDto;
+import com.java110.dto.storeOrderAddress.StoreOrderAddressDto;
+import com.java110.goods.dao.IStoreOrderAddressServiceDao;
+import com.java110.intf.IStoreOrderAddressInnerServiceSMO;
+import com.java110.po.storeOrderAddress.StoreOrderAddressPo;
+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 StoreOrderAddressInnerServiceSMOImpl extends BaseServiceSMO implements IStoreOrderAddressInnerServiceSMO {
+
+    @Autowired
+    private IStoreOrderAddressServiceDao storeOrderAddressServiceDaoImpl;
+
+
+    @Override
+    public int saveStoreOrderAddress(@RequestBody StoreOrderAddressPo storeOrderAddressPo) {
+        int saveFlag = 1;
+        storeOrderAddressServiceDaoImpl.saveStoreOrderAddressInfo(BeanConvertUtil.beanCovertMap(storeOrderAddressPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int updateStoreOrderAddress(@RequestBody StoreOrderAddressPo storeOrderAddressPo) {
+        int saveFlag = 1;
+        storeOrderAddressServiceDaoImpl.updateStoreOrderAddressInfo(BeanConvertUtil.beanCovertMap(storeOrderAddressPo));
+        return saveFlag;
+    }
+
+    @Override
+    public int deleteStoreOrderAddress(@RequestBody StoreOrderAddressPo storeOrderAddressPo) {
+        int saveFlag = 1;
+        storeOrderAddressPo.setStatusCd("1");
+        storeOrderAddressServiceDaoImpl.updateStoreOrderAddressInfo(BeanConvertUtil.beanCovertMap(storeOrderAddressPo));
+        return saveFlag;
+    }
+
+    @Override
+    public List<StoreOrderAddressDto> queryStoreOrderAddresss(@RequestBody StoreOrderAddressDto storeOrderAddressDto) {
+
+        //校验是否传了 分页信息
+
+        int page = storeOrderAddressDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            storeOrderAddressDto.setPage((page - 1) * storeOrderAddressDto.getRow());
+        }
+
+        List<StoreOrderAddressDto> storeOrderAddresss = BeanConvertUtil.covertBeanList(storeOrderAddressServiceDaoImpl.getStoreOrderAddressInfo(BeanConvertUtil.beanCovertMap(storeOrderAddressDto)), StoreOrderAddressDto.class);
+
+        return storeOrderAddresss;
+    }
+
+
+    @Override
+    public int queryStoreOrderAddresssCount(@RequestBody StoreOrderAddressDto storeOrderAddressDto) {
+        return storeOrderAddressServiceDaoImpl.queryStoreOrderAddresssCount(BeanConvertUtil.beanCovertMap(storeOrderAddressDto));
+    }
+
+    public IStoreOrderAddressServiceDao getStoreOrderAddressServiceDaoImpl() {
+        return storeOrderAddressServiceDaoImpl;
+    }
+
+    public void setStoreOrderAddressServiceDaoImpl(IStoreOrderAddressServiceDao storeOrderAddressServiceDaoImpl) {
+        this.storeOrderAddressServiceDaoImpl = storeOrderAddressServiceDaoImpl;
+    }
+}