Przeglądaj źródła

feat:付款流水号和凭证截图

xuyongjun 1 rok temu
rodzic
commit
dbb2555634

+ 6 - 0
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -858,6 +858,12 @@ public class AdminSalesOrderController {
         //admin id
         salesOrder.setSalesAdminId(admin.getAdminId());
         salesOrder.setSalesOrderItemList(salesOrderItemList);
+        if (StringUtils.isBlank(salesOrder.getSalesPaymentNo())) {
+            salesOrder.setSalesPaymentNo(null);
+        }
+        if (StringUtils.isBlank(salesOrder.getSalesPaymentVoucher())) {
+            salesOrder.setSalesPaymentVoucher(null);
+        }
         try {
             // 添加订单
             if(salesOrder.getSalesBatchId() == null || "".equals(salesOrder.getSalesBatchId()) || "1".equals(salesOrder.getSalesBatchId())){

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -159,7 +159,7 @@
                 <th width="10">付款凭证截图:</th>
                 <td width="10">
                     <span>
-                        <#if order.salesPaymentVoucher??>
+                        <#if order.salesPaymentVoucher?? && order.salesPaymentVoucher?has_content>
                             <a href="${path}${order.salesPaymentVoucher!''}" target="_blank" style="text-decoration: underline; color: blue">点我查看</a>
                         </#if>
                     </span>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/update_order.ftl

@@ -252,7 +252,7 @@
                 <div class="formControls col-2 col-sm-2">
                     <button onClick="uploadPaymentVoucher();" type="button"  class="btn" style="border: 1px solid #50a2ea;background-color: #fff;color: #50a2ea;-webkit-transform:translateY(-5%);height: 30px;">上传图片</button>
                     <span id="uploadState">
-                        <#if order.salesPaymentVoucher??>
+                        <#if order.salesPaymentVoucher?? && order.salesPaymentVoucher?has_content>
                             <a href="${path}${order.salesPaymentVoucher}" style="text-decoration: underline; color: blue" target="_blank">已上传</a>
                         </#if>
                     </span>