上传商品资质问题

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -87,7 +87,7 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
      *
      * @param recordId
      */
-    void deleteQualificationImage(String recordId);
+    void deleteQualificationImage(Integer recordId);
 
     /**
      * 保存资质图片
@@ -95,14 +95,14 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
      * @param recordId
      * @param image
      */
-    void insertQualificationImage(@Param("recordId") String recordId, @Param("image") String image);
+    void insertQualificationImage(@Param("recordId") Integer recordId, @Param("image") String image);
 
     /**
      * 删除商品资质文件
      *
      * @param recordId
      */
-    void deleteQualificationFile(String recordId);
+    void deleteQualificationFile(Integer recordId);
 
     /**
      * 保存商品资质文件
@@ -111,5 +111,5 @@ public interface NewOrderDao extends CrudDao<NewOrder> {
      * @param fileName
      * @param ossName
      */
-    void insertQualificationFile(@Param("recordId") String recordId, @Param("fileName") String fileName, @Param("ossName") String ossName);
+    void insertQualificationFile(@Param("recordId") Integer recordId, @Param("fileName") String fileName, @Param("ossName") String ossName);
 }

src/main/java/com/caimei/modules/order/entity/LogisticsRecord.java

@@ -33,6 +33,7 @@ public class LogisticsRecord extends DataEntity<LogisticsRecord> {
     private List<String> imageList;  //资质图片
     private String[] images;
     private String[] files;
+    private Integer recordId; //发货记录id
 
 
     public Integer getLogisticsBatchID() {
@@ -178,4 +179,12 @@ public class LogisticsRecord extends DataEntity<LogisticsRecord> {
     public void setUploadTime(Date uploadTime) {
         this.uploadTime = uploadTime;
     }
+
+    public Integer getRecordId() {
+        return recordId;
+    }
+
+    public void setRecordId(Integer recordId) {
+        this.recordId = recordId;
+    }
 }

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1983,25 +1983,25 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         logisticsRecordDao.updateLogisticsRecord(logisticsRecord);
         //商品资质图片
         String[] images = logisticsRecord.getImages();
-        newOrderDao.deleteQualificationImage(logisticsRecord.getId());
+        newOrderDao.deleteQualificationImage(logisticsRecord.getRecordId());
         if (images != null && images.length > 0) {
             for (String image : images) {
                 if (StringUtils.isNotBlank(image)) {
                     image = UploadPicUtils.saveImageToServer(image);
-                    newOrderDao.insertQualificationImage(logisticsRecord.getId(), image);
+                    newOrderDao.insertQualificationImage(logisticsRecord.getRecordId(), image);
                 }
             }
         }
         //商品资质文件
         String[] files = logisticsRecord.getFiles();
-        newOrderDao.deleteQualificationFile(logisticsRecord.getId());
+        newOrderDao.deleteQualificationFile(logisticsRecord.getRecordId());
         if (files != null && files.length > 0) {
             for (String file : files) {
                 if (StringUtils.isNotBlank(file)) {
                     String[] split = file.split("---");
                     String fileName = split[0];
                     String ossName = split[1];
-                    newOrderDao.insertQualificationFile(logisticsRecord.getId(), fileName, ossName);
+                    newOrderDao.insertQualificationFile(logisticsRecord.getRecordId(), fileName, ossName);
                 }
             }
         }
@@ -2016,7 +2016,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
             item.setImage(AppUtils.getImageURL("product", item.getImage(), 0, wwwServer));
             List<CmFile> fileList = newOrderDao.findQualificationFile(item.getId());
             item.setFileList(fileList);
-            List<String> images = newOrderDao.findQualificationImage(Integer.valueOf(item.getId()));
+            List<String> images = newOrderDao.findQualificationImage(item.getRecordId());
             item.setImageList(images);
             boolean isFile = (fileList == null || fileList.size() == 0);
             boolean isImage = (images == null || images.size() == 0);

src/main/resources/mappings/modules/order/LogisticsRecordMapper.xml

@@ -42,6 +42,7 @@
 	<select id="findByLogisticsBatchID" resultType="LogisticsRecord">
 		select
 			a.id AS id,
+			a.id AS recordId,
 			a.logisticsBatchID AS logisticsBatchID,
 			a.shopOrderID AS shopOrderID,
 			a.orderID AS orderID,

src/main/webapp/WEB-INF/views/modules/order/qualification.jsp

@@ -137,6 +137,7 @@
     <h3><span class="left-span"></span>订单列表--商品资质</h3>
     <div class="ship-shop">
         <form id="shipForm" method="post">
+            <sys:message content="${message}"/>
             <table class="table">
                 <tr>
                     <th>供应商</th>

src/main/webapp/WEB-INF/views/modules/order/qualificationForm.jsp

@@ -207,6 +207,7 @@
         <form:form id="inputForm" modelAttribute="logisticsRecord" action="${ctx}/order/saveQualification" method="post" class="form-horizontal">
             <sys:message content="${message}"/>
             <form:hidden path="logisticsBatchID"/>
+            <form:hidden path="recordId"/>
             <div class="control-group">
                 <label class="control-label">SN码：</label>
                 <div class="controls">