审批代码

watero-common-tool/src/main/java/com/iamberry/wechat/tools/ResultInfo.java

@@ -242,11 +242,11 @@ public class ResultInfo {
 	/** 	申请单出库通知 	*/
 	public static String DELIVERYAPPLICATIONFORM = "{'first':{'color':'#173177','value':'firstValueIamberry'}, 'keyword1':{'color':'#173177','value':'keyword1Value'}, 'keyword2':{'color':'#173177', 'value':'keyword2Value'},'keyword3':{'color':'#173177','value':'keyword3Value'},'remark':{'color':'#FF0000','value':'remarkValue'}}";
 	/** 	我审核列表url 	*/
-	public static String LISTBEREVIEWED = "http://static.iamberry.com/rst/approval/pro_order_list_index.html?type=2";
+	public static String LISTBEREVIEWED = "https://s.iamberry.com/rst/approval/pro_order_list_index.html?type=2";
 	/** 	我发起列表url 	*/
-	public static String LISTISTARTED = "http://static.iamberry.com/rst/approval/pro_order_list_index.html?type=1";
+	public static String LISTISTARTED = "https://s.iamberry.com/rst/approval/pro_order_list_index.html?type=1";
 	/** 	仓库列表url 	*/
-	public static String LISTWAREHOUSE = "http://static.iamberry.com/rst/approval/pro_order_list_index.html?type=3";
+	public static String LISTWAREHOUSE = "https://s.iamberry.com/rst/approval/pro_order_list_index.html?type=3";
 
 
 	/** 	RST模板消息 end 	*/

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -60,6 +60,7 @@ public class SalesOrder implements Serializable {
     private Integer salesOrderStatus;       //订单状态 订单状态：1：正常 2：换货 3：退货  4:维修  5：补发
     private Integer salesShippingStatus;    //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
     private Integer salesDeliver;            //出库状态  1：未出库   2：已出库
+    private Date salesDeliverTime;            //出库时间
     private Integer salesPayStatus;         //付款状态 0(未付款)2(已付款)
     private Integer salesProcessStatus;     //单据状态  0(正常单)1(问题单)
     private Integer salesIsSend;            //是否通知配货    0：否1：是
@@ -656,4 +657,12 @@ public class SalesOrder implements Serializable {
     public void setSalesAdminName(String salesAdminName) {
         this.salesAdminName = salesAdminName;
     }
+
+    public Date getSalesDeliverTime() {
+        return salesDeliverTime;
+    }
+
+    public void setSalesDeliverTime(Date salesDeliverTime) {
+        this.salesDeliverTime = salesDeliverTime;
+    }
 }

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

@@ -1255,7 +1255,8 @@
     <update id="updateDeliver" parameterType="SalesOrder" >
         update tb_rst_sales_order_info
         SET
-          sales_deliver = #{salesDeliver}
+          sales_deliver = #{salesDeliver},
+          sales_deliver_time = NOW()
         WHERE
           sales_post_num = #{salesPostNum}
         AND sales_id = #{salesId}

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApprovalController.java

@@ -215,8 +215,7 @@ public class ApprovalController {
                 boolean flag = generateImage(shareImgUrl, imgFilePath + "/" + fileName);
                 if(flag){
                     responseJson.setReturnCode(200);
-                    String realPath = req.getServerName();
-                    responseJson.addResponseKeyValue("imgUrl","//"+realPath+ResultInfo.CONTRACT_IMAGE+fileName);
+                    responseJson.addResponseKeyValue("imgUrl","//rst.iamberry.com/"+ResultInfo.CONTRACT_IMAGE+fileName);
                 }else{
                     responseJson.setReturnCode(500);
                 }

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

@@ -764,25 +764,30 @@ public class AdminOrderController {
 
         // 标题
         List<String> titles = new ArrayList<String>();
+        titles.add("订单创建日期");
         titles.add("订单编号");
-        titles.add("Efast交易号");
+        titles.add("交易号");
         titles.add("订单类型");
-        titles.add("收货人");
-        titles.add("收货人电话");
+        titles.add("姓名");
+        titles.add("电话");
+        titles.add("省");
+        titles.add("市");
         titles.add("收货人地址");
         titles.add("快递公司");
         titles.add("快递单号");
         titles.add("商品名称");
-        titles.add("商品颜色");
+        //titles.add("商品颜色");
         titles.add("商品数量");
-        titles.add("销售公司名称");
-        titles.add("店铺名称");
+        //titles.add("销售公司名称");
+        //titles.add("店铺名称");
+        titles.add("出库日期");
         model.put("titles", titles);
         PtsBatch ptsBatch = new PtsBatch();
         List<List<Object>> countexts = new ArrayList<List<Object>>();
         if(temporarySalesOrderList != null && temporarySalesOrderList.size() >0){
             for (SalesOrder salesOrder : temporarySalesOrderList) {
                 List<Object> row = new ArrayList<Object>();
+                SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日");
                 /*row.add(efastOrder.getPlatformOrderId() == null ? null:efastOrder.getPlatformOrderId());
                 row.add(efastOrder.getOrderDealCode() == null ? null:efastOrder.getOrderDealCode());
                 row.add(efastOrder.getOrderAddressName() == null ? null:efastOrder.getOrderAddressName());
@@ -793,10 +798,9 @@ public class AdminOrderController {
                 row.add(efastOrder.getOrderPostNum() == null ? null:efastOrder.getOrderPostNum());
                 row.add(efastOrder.getOrderProductName() == null ? null:efastOrder.getOrderProductName());
                 row.add(efastOrder.getOrderNum() == null ? null:efastOrder.getOrderNum());*/
+                row.add(salesOrder.getSalesCreateTime() == null ? null:formatter.format(salesOrder.getSalesCreateTime()));
                 row.add(salesOrder.getSalesOrderId() == null ? null:salesOrder.getSalesOrderId());
                 row.add(salesOrder.getSalesDealCode() == null ? null:salesOrder.getSalesDealCode());
-
-
                 if(salesOrder.getSalesCustomerId() == null){
                     row.add("正常订单");
                 }else{
@@ -834,15 +838,25 @@ public class AdminOrderController {
                 }
                 row.add(salesOrder.getSalesAddressName() == null ? null:salesOrder.getSalesAddressName());
                 row.add(salesOrder.getSalesAddressTel() == null ? null:salesOrder.getSalesAddressTel());
+                //分割省市
+                if(salesOrder.getSalesAddressInfo() == null){
+                    row.add(null);
+                    row.add(null);
+                }else{
+                    String[] strarray=salesOrder.getSalesAddressInfo().split(" ");
+                    row.add(strarray[0]);
+                    row.add(strarray[1]);
+                }
                 row.add(salesOrder.getSalesAddressInfo() == null ? null:salesOrder.getSalesAddressInfo());
                 String frim = replace(salesOrder.getSalesPostFirm());
                 row.add(frim);
                 row.add(salesOrder.getSalesPostNum() == null ? null:salesOrder.getSalesPostNum());
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName());
-                row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
+                //row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
-                row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
-                row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
+                //row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
+                //row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
+                row.add(salesOrder.getSalesDeliverTime() == null ? null:formatter.format(salesOrder.getSalesDeliverTime()));
                 countexts.add(row);
             }
         }