增加上传下载efast接口

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

@@ -28,5 +28,5 @@ public interface StoreInfoService {
      * @param storeEfast
      * @return
      */
-    StoreInfo getStoreInfoByEfastId(Integer storeEfast);
+    StoreInfo getStoreInfoByEfastId(String storeEfast);
 }

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

@@ -28,7 +28,7 @@ public class StoreInfoServiceImpl implements StoreInfoService {
     }
 
     @Override
-    public StoreInfo getStoreInfoByEfastId(Integer storeEfast) {
+    public StoreInfo getStoreInfoByEfastId(String storeEfast) {
         return storeInfoMapper.getStoreInfoByEfastId(storeEfast);
     }
 }

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

@@ -25,7 +25,7 @@ public interface StoreInfoMapper {
      * @param storeEfast
      * @return
      */
-    StoreInfo getStoreInfoByEfastId(Integer storeEfast);
+    StoreInfo getStoreInfoByEfastId(String storeEfast);
 
     /**
      * 修改店铺信息

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

@@ -23,11 +23,11 @@
   </select>
 
   <!-- 根据efastid查询店铺信息 -->
-  <select id="getStoreInfoByEfastId" resultType="StoreInfo" parameterType="java.lang.Integer" >
+  <select id="getStoreInfoByEfastId" resultType="StoreInfo" parameterType="java.lang.String" >
     select
     <include refid="storeInfo" />
     from tb_rst_store_info
-    where store_efast = #{storeEfast,jdbcType=INTEGER}
+    where store_efast = #{storeEfast,jdbcType=VARCHAR}
   </select>
 
   <!-- 根据条件查询店铺信息 -->

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

@@ -94,7 +94,7 @@ public class MallOrderController {
             Date pay_time = format.parse(requstMap.get("pay_time").toString());//支付时间
             String postscript = (String)requstMap.get("postscript");//买家留言
             String to_buyer = (String)requstMap.get("to_buyer");//商家留言
-            Integer sd_id = (Integer)requstMap.get("sd_id");//商店ID(店铺id)
+            String sd_id = (String)requstMap.get("sd_id");//商店ID(店铺id)
             Integer shipping_fee = (Integer)requstMap.get("shipping_fee");//邮费
             String shipping_name = (String)requstMap.get("shipping_name");//快递公司代码
             String tel = (String)requstMap.get("tel");//收货人电话
@@ -227,7 +227,7 @@ public class MallOrderController {
         SalesOrder salesOrder = new SalesOrder();
         try {
             String orderId = (String)requstMap.get("orderId");//订单号
-            Integer sd_id = (Integer)requstMap.get("sd_id");//店铺id
+            String sd_id = (String)requstMap.get("sd_id");//店铺id
             StoreInfo storeInfo = storeInfoService.getStoreInfoByEfastId(sd_id);
             salesOrder.setSalesDealCode(orderId);
             salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
@@ -238,7 +238,7 @@ public class MallOrderController {
             return null;
         }
         if (salesOrder == null) {
-            map.put("msg","get error");
+            map.put("msg","no order");
             map.put("oder_sn",new Date().getTime());
         }else{
             if(salesOrder.getSalesPostFirm() != null && salesOrder.getSalesPostNum() !=null){

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -237,6 +237,8 @@
                                     });
                         },
                         error: function(XmlHttpRequest, textStatus, errorThrown){
+                            var index = parent.layer.getFrameIndex(window.name);
+                            parent.layer.close(index);
                             layer.msg("上传失败",{icon: 2,time:3000});
                         }
                     });