bug fixes

src/main/java/com/caimei/modules/oss/utils/OSSUtils.java

@@ -139,6 +139,11 @@ public class OSSUtils {
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
         // 设置URL过期时间为1个小时
         Date expiration = new Date(new Date().getTime() + 3600L * 1000);
+        if ("product".equals(config)) {
+            fileName = "prod/" + fileName;
+        } else {
+            fileName = config + "/" + fileName;
+        }
         String url = ossClient.generatePresignedUrl(privateBucket, fileName, expiration).toString();
         // 关闭OSSClient。
         ossClient.shutdown();

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

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

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

@@ -319,7 +319,7 @@ window.onload = function () {
             type : 'post',
             success : function(data){
                 if (data.success) {
-                    window.location.href = "${ctx}/order/logisticsDetails?orderID=${orderID}";
+                    window.location.href = "${ctx}/order/qualificationList?logisticsBatchId="+data.logisticsBatchId;
                 } else {
                     alert(data.msg);
                 }

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

@@ -222,7 +222,7 @@
 <form:form id="inputForm" modelAttribute="payShopOther" action="${ctx}/order/cmPayShop/saveShopOtherFee" method="post" class="form-horizontal">
     <form:hidden path="shopOrderId"/>
     <div class="control-group">
-        <label class="control-label"><font color='red'>*</font>差价金额：</label>
+        <label class="control-label"><font color='red'>*</font>付第三方金额：</label>
         <div class="controls">
             <input type="number" id="shopOtherFee" required name="shopOtherFee" onchange="changeShouldPay(this)"/>
         </div>