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

@@ -576,5 +576,13 @@ public interface SalesOrderService {
     /**
      *订单跟踪查询
      */
-    List<OrderTracking> listTracking(String salesDealCode);
+    List<OrderTracking> listTracking(Integer trackingId);
+    /**
+     *查询手动修改订单号状态的订单数据
+     */
+    List<SalesOrder> listUpdateOrderShippingStatus();
+    /**
+     *修改订单打单状态信息
+     */
+    Integer updateSalesOrderShippingStatus(SalesOrder salesOrder);
 }

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

@@ -2011,6 +2011,16 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.listTracking(salesDealCode);
     }
 
+    @Override
+    public List<SalesOrder> listUpdateOrderShippingStatus() {
+        return salesOrderMapper.listUpdateOrderShippingStatus();
+    }
+
+    @Override
+    public Integer updateSalesOrderShippingStatus(SalesOrder salesOrder) {
+        return salesOrderMapper.updateSalesOrderShippingStatus(salesOrder);
+    }
+
     /***
      * 计算金额
      * @param salesOrder

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

@@ -511,4 +511,12 @@ public interface SalesOrderMapper {
      *根据订单id集合查询订单
      */
     List<SalesOrder> listSalesOrderBySalesIds(SalesOrder salesOrder);
+    /**
+     *查询手动修改订单号状态的订单数据
+     */
+    List<SalesOrder> listUpdateOrderShippingStatus();
+    /**
+     *修改订单打单状态信息
+     */
+    Integer updateSalesOrderShippingStatus(SalesOrder salesOrder);
 }

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

@@ -2474,4 +2474,21 @@
             #{node}
         </foreach >
     </select>
+
+    <select id="listUpdateOrderShippingStatus" resultType="SalesOrder" parameterType="SalesOrder" >
+        SELECT
+        time1 AS salesOrderId
+        FROM test1
+    </select>
+    <!-- 修改订单打单状态信息 -->
+    <update id="updateSalesOrderShippingStatus" parameterType="SalesOrder" >
+        update
+        tb_rst_sales_order_info
+        <set >
+            <if test="salesShippingStatus != null ">
+                sales_shipping_status = #{salesShippingStatus}
+            </if >
+        </set>
+        where sales_orderId = #{salesOrderId}
+    </update>
 </mapper>

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

@@ -35,6 +35,7 @@ import com.iamberry.rst.faces.sms.MessageService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.*;
+import com.iamberry.wechat.core.entity.OrderUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ObjectExcelView;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -2786,4 +2787,31 @@ public class AdminOrderController {
         return responseJson;
     }
 
+
+    /**
+     * 手动修改订单状态为未打印
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/updateOrderShippingStatus")
+    public ResponseJson updateOrderShippingStatus(HttpServletRequest request) {
+        ResponseJson responseJson = new ResponseJson();
+        OrderUtils thiss = new OrderUtils();
+        String filePath = request.getServletContext().getRealPath("/common/send_order");
+        //查询订单编号
+        List<SalesOrder> salesS =  salesOrderService.listUpdateOrderShippingStatus();
+        if(salesS.size() > 0){
+            for (SalesOrder sales : salesS){
+               if(sales.getSalesOrderId() != null && !sales.getSalesOrderId().equals("")){
+                   sales.setSalesShippingStatus(11);
+                   salesOrderService.updateSalesOrderShippingStatus(sales);
+                   //删除文件
+                   thiss.deleteFile(filePath+"/"+sales.getSalesOrderId()+".txt");
+               }
+            }
+        }
+        return responseJson;
+    }
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/scm/AdminScmOrderController.java

@@ -468,7 +468,8 @@ public class AdminScmOrderController {
         } else if (post.equalsIgnoreCase("STO")) {
             // 申通快递
             eOrderRequestData.CustomerName = ("爱贝源");
-            eOrderRequestData.CustomerPwd = ("Iamberry321.");
+            /*eOrderRequestData.CustomerPwd = ("Iamberry321.");*/
+            eOrderRequestData.CustomerPwd = ("Sto20200211");
             eOrderRequestData.SendSite = ("广东东莞公司");
         } else if (post.equalsIgnoreCase("DBL")) {
             //德邦 (360特惠件)

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -210,4 +210,19 @@ public class OrderUtils {
             e.printStackTrace();
         }
     }
+    /**
+     * 删除单个文件
+     * @param   sPath    被删除文件的文件名
+     * @return 单个文件删除成功返回true，否则返回false
+     */
+    public boolean deleteFile(String sPath) {
+        boolean flag = false;
+        File file = new File(sPath);
+        // 路径为文件且不为空则进行删除
+        if (file.isFile() && file.exists()) {
+            file.delete();
+            flag = true;
+        }
+        return flag;
+    }
 }

watero-rst-web/src/main/resources/dev-jdbc.properties

@@ -1,13 +1,13 @@
 jdbc.driver=com.mysql.jdbc.Driver
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD ####
-#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-#jdbc.username=watero_rst
-#jdbc.password=watero_RST
+jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+jdbc.username=watero_rst
+jdbc.password=watero_RST
 ##### \uFFFD\uFFFD\u02BD\uFFFD\uFFFD\uFFFD\uFFFD end #####
 
-jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
-jdbc.username=rst_test
-jdbc.password=RST_test
+#jdbc.url=jdbc:mysql://iamberry.mysql.rds.aliyuncs.com/rst_test_2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull
+#jdbc.username=rst_test
+#jdbc.password=RST_test
 
 #pool settings
 jdbc.pool.init=1

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl

@@ -513,7 +513,7 @@
                                 </#if>
                             </#if>
                             <td>${postageInfo.postageDesc!''}</td>
-                            <td><#if postageInfo.postagePayImg??><img style="width: 50px;height: 50px;" src="${path}/${postageInfo.postagePayImg!''}"></#if></td>
+                            <td><#if postageInfo.postagePayImg??><img style="width: 50px;height: 50px;" src="${path}/${postageInfo.postagePayImg!''}"> <#else> 未上传</#if></td>
                             <td>
                                 <#if postageInfo.postageIsPrint??>
                                     <#if postageInfo.postageIsPrint == 1>未打印</#if>