bugfix-订单资料编号

src/main/java/com/caimei/modules/archive/entity/CmOrderArchive.java

@@ -30,6 +30,7 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	private Integer orderStatus;	// 主订单状态：0待确认,11待收待发,12待收部发,13待收全发,21部收待发,22部收部发,23部收全发,31已收待发,32已收部发,33已收全发,4交易完成,5订单完成,6已关闭,7交易全退
 	private Integer fileNum;		//文件数量
 
+	private Integer updateShopOrderIdFlag;		// 修改子订单id标识，1修改，其他不修改
 	/**
 	 * 上传文件id,以","隔开
 	 */
@@ -153,4 +154,12 @@ public class CmOrderArchive extends DataEntity<CmOrderArchive> {
 	public void setFileNum(Integer fileNum) {
 		this.fileNum = fileNum;
 	}
+
+	public Integer getUpdateShopOrderIdFlag() {
+		return updateShopOrderIdFlag;
+	}
+
+	public void setUpdateShopOrderIdFlag(Integer updateShopOrderIdFlag) {
+		this.updateShopOrderIdFlag = updateShopOrderIdFlag;
+	}
 }

src/main/java/com/caimei/modules/archive/service/CmOrderArchiveService.java

@@ -62,6 +62,11 @@ public class CmOrderArchiveService extends CrudService<CmOrderArchiveDao, CmOrde
 	public void saveArchive(CmOrderArchive cmOrderArchive) {
         if (cmOrderArchive.getIsNewRecord()) {
             cmOrderArchive.setAddTime(new Date());
+        } else {
+            CmOrderArchive dbOrderArchive = get(cmOrderArchive.getId());
+            if (!cmOrderArchive.getShopOrderId().equals(dbOrderArchive.getShopOrderId()) ) {
+                cmOrderArchive.setUpdateShopOrderIdFlag(1);
+            }
         }
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         String date = format.format(new Date());

src/main/resources/mappings/modules/archive/CmOrderArchiveMapper.xml

@@ -208,7 +208,10 @@
 
     <update id="update">
         UPDATE cm_order_archive
-        SET archiveNo   = #{archiveNo},
+        SET
+            <if test="updateShopOrderIdFlag != null and  1 == updateShopOrderIdFlag">
+                archiveNo = #{archiveNo},
+            </if>
             title       = #{title},
             shopOrderId = #{shopOrderId},
             shopName    = #{shopName},

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveFileList.jsp

@@ -100,7 +100,7 @@
                 <fmt:formatDate value="${cmOrderArchiveFile.uploadTime}" pattern="yyyy-MM-dd HH:mm:ss"/>
             </td>
             <td>
-                <a onclick="previewFile('${cmOrderArchiveFile.ossUrl}')" target="_blank">预览</a>
+                <a href="javascript:;" onclick="previewFile('${cmOrderArchiveFile.ossUrl}')" target="_blank">预览</a>
                 <a href="${ctx}/archive/cmOrderArchive/downFile?fileId=${cmOrderArchiveFile.id}">下载</a>
             </td>
         </tr>

src/main/webapp/WEB-INF/views/modules/archive/cmOrderArchiveForm.jsp

@@ -51,6 +51,8 @@
 					if (result.code == 0) {
 						$("#clubName").val(result.clubName);
 						$("#shopName").val(result.shopName);
+					} else {
+						jBox.tip(result.msg, "error");
 					}
 				});
 			}