订单打印

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/StoreShipService.java

@@ -22,6 +22,14 @@ public interface StoreShipService {
      * @return  storeShip
      */
     StoreShip  getStoreShipById(Integer  id);
+
+    /**
+     * 查询发货信息
+     * @param id
+     * @return
+     */
+    StoreShip  getStoreShipByStoreId(Integer  id);
+
     /**
      * 增加数据
      * @param  storeShip

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/StoreShipServiceImpl.java

@@ -35,6 +35,12 @@ public class StoreShipServiceImpl  implements StoreShipService {
     public  StoreShip  getStoreShipById(Integer  id){
         return  storeShipMapper.getStoreShipById(id);
     }
+
+    @Override
+    public StoreShip getStoreShipByStoreId(Integer id) {
+        return  storeShipMapper.getStoreShipByStoreId(id);
+    }
+
     /**
      * 增加数据
      * @param  storeShip

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/StoreShipMapper.java

@@ -22,6 +22,15 @@ public interface StoreShipMapper {
      * @return  storeShip
      */
     StoreShip  getStoreShipById(Integer  id);
+
+    /**
+     * 查询发货信息
+     * @param id
+     * @return
+     */
+    StoreShip  getStoreShipByStoreId(Integer  id);
+
+
     /**
      * 增加数据
      * @param  storeShip

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/storeShipMapper.xml

@@ -46,6 +46,14 @@
         from tb_rst_store_ship t
         where t.store_ship_id= #{storeShipId}
     </select>
+
+    <select id="getStoreShipByStoreId" resultMap="BaseResultMap" parameterType="Integer" >
+        select
+        <include refid="Base_List" />
+        from tb_rst_store_ship t
+        where t.store_id= #{storeId}
+    </select>
+
     <insert id="save" parameterType="StoreShip" >
         insert into
         tb_rst_store_ship

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -3,10 +3,12 @@ package com.iamberry.rst.controllers.order;
 import com.alibaba.fastjson.JSONObject;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.SalesOrderItem;
+import com.iamberry.rst.core.cm.StoreShip;
 import com.iamberry.rst.core.order.EOrderRequestData;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.rst.faces.cm.StoreShipService;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.utils.OrderUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
@@ -44,6 +46,8 @@ public class AwaitSendController {
     @Autowired
     private SalesOrderService salesOrderService;
     @Autowired
+    private StoreShipService storeShipService;
+    @Autowired
     private LogisticsInfoService logisticsInfoService;
 
 
@@ -137,6 +141,15 @@ public class AwaitSendController {
                                    HttpServletRequest request) {
         SalesOrder salesOrderInfo = salesOrderService.getSalesOrderById(salesId);
 
+        StoreShip storeShip = null;
+        if(salesOrderInfo.getSalesStoreId() != null){
+            storeShip = storeShipService.getStoreShipByStoreId(salesOrderInfo.getSalesStoreId());
+        }
+        if(storeShip == null){
+            LOGGER.error("{} 获取电子面单失败，原因:{}", orderId, "该订单没有绑定店铺或店铺没有发货人信息");
+            return ResponseJson.getFAILURE().addResponseKeyValue("error","该订单没有绑定店铺或店铺没有发货人信息");
+        }
+
         /*
          * 组装数据
          */
@@ -192,11 +205,11 @@ public class AwaitSendController {
         eOrderRequestData.setReceiver(Receiver);
         // 发件人信息
         Map<String, Object> Sender = new HashMap<String, Object>();
-        Sender.put("Name", "爱贝源");
-        Sender.put("Tel", "13112639663");
-        Sender.put("ProvinceName", "广东省");
-        Sender.put("CityName", "东莞市");
-        Sender.put("Address", "东莞清溪三中金龙工业区优尼雅电子科技");
+        Sender.put("Name", storeShip.getStoreShipName());
+        Sender.put("Tel", storeShip.getStoreShipTel());
+        Sender.put("ProvinceName", storeShip.getStoreShipProvince());
+        Sender.put("CityName", storeShip.getStoreShipCity());
+        Sender.put("Address", storeShip.getStoreShipAddress());
         eOrderRequestData.setSender(Sender);
         // 产品信息
         List<Map<String, Object>> Commodity = new ArrayList<>();

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -87,6 +87,7 @@
 		<typeAlias type="com.iamberry.rst.core.cm.PostageAuthority" alias="PostageAuthority"/>
 		<typeAlias type="com.iamberry.rst.core.cm.PostageAuthorityLog" alias="PostageAuthorityLog"/>
 		<typeAlias type="com.iamberry.rst.core.cm.RelationOrder" alias="RelationOrder"/>
+		<typeAlias type="com.iamberry.rst.core.cm.StoreShip" alias="StoreShip"/>
 
 		<typeAlias type="com.iamberry.rst.core.sys.SysConfig" alias="SysConfig"/>
 
@@ -170,6 +171,7 @@
 		<mapper resource="com/iamberry/rst/service/cm/mapper/postageAuthorityMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/postageAuthorityLogMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/cm/mapper/relationOrderMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/cm/mapper/storeShipMapper.xml"/>
 
 		<mapper resource="com/iamberry/rst/service/address/mapper/addressMapper.xml"/>