Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -291,7 +291,7 @@ public interface SalesOrderService {
      * @param salesOrder
      * @return
      */
-    Integer noticeDistribution(SalesOrder salesOrder);
+    Integer noticeDistribution(SalesOrder salesOrder,Integer adminId);
 
     /**
      * 确认订单，需要传入完整的order
@@ -311,14 +311,14 @@ public interface SalesOrderService {
      * @param salesOrder
      * @return
      */
-    Integer listSalesPostFirm(SalesOrder salesOrder);
+    Integer listSalesPostFirm(SalesOrder salesOrder,Integer adminId);
 
     /**
      * 批量分配快递方式
      * @param salesOrder
      * @return
      */
-    Integer listSalesPostFirmByIds(SalesOrder salesOrder);
+    Integer listSalesPostFirmByIds(SalesOrder salesOrder,Integer adminId);
     /**
      * 查询订单
      * @param postNum
@@ -460,7 +460,7 @@ public interface SalesOrderService {
      * @param salesOrderList
      * @return
      */
-    Integer splitOrder(String mainOrderId, List<SalesOrder> salesOrderList);
+    Integer splitOrder(String mainOrderId, List<SalesOrder> salesOrderList,Integer adminId);
 
     /**
      * 根据店铺id获取售后规则

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

@@ -1285,7 +1285,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
-    public Integer noticeDistribution(SalesOrder salesOrder) {
+    public Integer noticeDistribution(SalesOrder salesOrder,Integer adminId) {
         // 检查订单是否已经有了配送方式,如果没有不允许通知配货 -- 移到controller中自己添加
 //        SalesOrder temp = salesOrderMapper.getSalesOrderById(salesOrder.getSalesId());
 //        if (temp == null || temp.getSalesPostFirm() == null || temp.getSalesPostFirm().isEmpty()) {
@@ -1295,7 +1295,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         if(msg > 0){
             //添加操作跟踪信息
             OrderTracking orderTracking = new OrderTracking();
-            orderTracking.setAdminId(salesOrder.getTrackingAdminId());
+            orderTracking.setAdminId(adminId);
             orderTracking.setSalesDealCode(salesOrder.getSalesDealCode());
             orderTracking.setTrackingDesc("通知配货");
             salesOrderService.addTracking(orderTracking);
@@ -1354,14 +1354,14 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return salesOrderMapper.distributionExpress(salesOrder);
     }
     @Override
-    public Integer listSalesPostFirm(SalesOrder salesOrder) {
+    public Integer listSalesPostFirm(SalesOrder salesOrder,Integer adminId) {
         int msg = salesOrderMapper.listSalesPostFirm(salesOrder);
         if(msg > 0){
             List<SalesOrder> listOrder = salesOrderMapper.listSalesOrderByBatchId(salesOrder.getSalesBatchId());
             for(SalesOrder prder : listOrder){
                 //添加操作跟踪信息
                 OrderTracking orderTracking = new OrderTracking();
-                orderTracking.setAdminId(salesOrder.getTrackingAdminId());
+                orderTracking.setAdminId(adminId);
                 orderTracking.setSalesDealCode(prder.getSalesDealCode());
                 orderTracking.setTrackingDesc("分配快递方式（批次-"+ salesOrder.getSalesPostFirm() +"）");
                 salesOrderService.addTracking(orderTracking);
@@ -1371,14 +1371,14 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
-    public Integer listSalesPostFirmByIds(SalesOrder salesOrder) {
+    public Integer listSalesPostFirmByIds(SalesOrder salesOrder,Integer adminId) {
         int msg = salesOrderMapper.listSalesPostFirmByIds(salesOrder);
         if(msg > 0){
             List<SalesOrder> listOrder = salesOrderMapper.listSalesOrderBySalesIds(salesOrder);
             for(SalesOrder prder : listOrder) {
                 //添加操作跟踪信息
                 OrderTracking orderTracking = new OrderTracking();
-                orderTracking.setAdminId(salesOrder.getTrackingAdminId());
+                orderTracking.setAdminId(adminId);
                 orderTracking.setSalesDealCode(prder.getSalesDealCode());
                 orderTracking.setTrackingDesc("分配物流方式（单个-"+prder.getSalesPostFirm()+")");
                 salesOrderService.addTracking(orderTracking);
@@ -1765,7 +1765,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     @Transactional
     @Override
-    public Integer splitOrder(String mainOrderId, List<SalesOrder> salesOrderList) {
+    public Integer splitOrder(String mainOrderId, List<SalesOrder> salesOrderList,Integer adminId) {
         /**
          * 1.查询以前的所有订单
          * 2.通过比对，余下删除的订单集合orderList
@@ -1775,13 +1775,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
         Integer flag = 0;
         String salesCode = "";
-        Integer adminId = 0;
 
         SalesOrder mainOrder = new SalesOrder();
         mainOrder.setSalesDealCode(mainOrderId);
         List<SalesOrder> orderList = salesOrderService.salesOrderListAndItem(mainOrder);
         salesCode = orderList.get(0).getSalesDealCode();
-        adminId = orderList.get(0).getSalesAdminId();
 
         SalesOrder or = new SalesOrder();
         or.setSalesMainOrderId(orderList.get(0).getSalesId());
@@ -1835,7 +1833,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
                 //添加操作跟踪信息
                 OrderTracking orderTracking = new OrderTracking();
-                orderTracking.setAdminId(salesOrder.getSalesAdminId());
+                orderTracking.setAdminId(adminId);
                 orderTracking.setSalesDealCode(salesOrder.getSalesDealCode());
                 orderTracking.setTrackingDesc("拆分订单（由："+salesCode+"拆分出来）");
                 salesOrderService.addTracking(orderTracking);
@@ -1855,7 +1853,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
                 //添加操作跟踪信息
                 OrderTracking orderTracking = new OrderTracking();
-                orderTracking.setAdminId(salesOrder.getSalesAdminId());
+                orderTracking.setAdminId(adminId);
                 orderTracking.setSalesDealCode(salesOrder.getSalesDealCode());
                 orderTracking.setTrackingDesc("拆分订单");
                 salesOrderService.addTracking(orderTracking);
@@ -1870,7 +1868,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
             //添加操作跟踪信息 - 删除操作
             OrderTracking orderTracking = new OrderTracking();
-            orderTracking.setAdminId(soDelete.getSalesAdminId());
+            orderTracking.setAdminId(adminId);
             orderTracking.setSalesDealCode(orderTracking.getSalesDealCode());
             orderTracking.setTrackingDesc("拆分订单（删除处理");
             salesOrderService.addTracking(orderTracking);

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

@@ -108,6 +108,8 @@ public class AdminOrderBatchController {
         if(batchId == null || warehouseId == null || warehouseId == 0){
             return rj;
         }
+        // 登陆的用户
+        Admin admin = AdminUtils.getLoginAdmin();
 
         SalesOrder salesOrder = new SalesOrder();
         salesOrder.setSalesBatchId(batchId);
@@ -121,7 +123,7 @@ public class AdminOrderBatchController {
                 newOrder.setSalesOrderId(so.getSalesDealCode());
                 newOrder.setSalesShippingStatus(11);
                 newOrder.setSalesWarehouseId(warehouseId);
-                salesOrderService.noticeDistribution(newOrder);
+                salesOrderService.noticeDistribution(newOrder,admin.getAdminId());
             }else{
                 ids += so.getSalesDealCode()+",";
                 flag++;
@@ -152,16 +154,19 @@ public class AdminOrderBatchController {
         if(salesOrder == null || salesOrder.getSalesPostFirm() == null){
             return ResponseJson.getFAILURE();
         }
+        // 登陆的用户
+        Admin admin = AdminUtils.getLoginAdmin();
+
         salesOrder.setTrackingAdminId(AdminUtils.getLoginAdminId());
         /* 分配到该批次下的所有订单 */
         try{
             int flag = 0;
             if(salesOrder.getSalesBatchId() != null && !salesOrder.getSalesBatchId().equals("")){
                 // 修改批次
-                flag = salesOrderService.listSalesPostFirm(salesOrder);
+                flag = salesOrderService.listSalesPostFirm(salesOrder,admin.getAdminId());
             }else if(salesOrder.getSalesIds() != null && salesOrder.getSalesIds().length > 0){
                 // 修改单个订单
-                flag = salesOrderService.listSalesPostFirmByIds(salesOrder);
+                flag = salesOrderService.listSalesPostFirmByIds(salesOrder,admin.getAdminId());
             }
             return flag <= 0 ? ResponseJson.getFAILURE() : ResponseJson.getSUCCESS();
         }catch (Exception e){

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

@@ -878,7 +878,7 @@ public class AdminSalesOrderController {
 
             //添加操作跟踪记录
             OrderTracking orderTracking = new OrderTracking();
-            orderTracking.setAdminId(salesOrder.getSalesAdminId());
+            orderTracking.setAdminId(admin.getAdminId());
             orderTracking.setSalesDealCode(salesOrder.getSalesDealCode());
             orderTracking.setTrackingDesc("创建订单(手动录入)");
             salesOrderService.addTracking(orderTracking);
@@ -1089,7 +1089,9 @@ public class AdminSalesOrderController {
         if(warehouseId == null || ids == null || type == null || "".equals(type)){
             return rj;
         }
-       switch (type){
+        // 登陆的用户
+        Admin admin = AdminUtils.getLoginAdmin();
+        switch (type){
            case "salesId":
                String salesIdStrs[] = ids.split(",");
                for (String salesIdStr:salesIdStrs) {
@@ -1111,7 +1113,7 @@ public class AdminSalesOrderController {
                    newOrder = suSalesOrder(newOrder);
                    /*判断主订单是否是其它订单的子订单 2019-10-08新需求     end*/
                    newOrder.setTrackingAdminId(AdminUtils.getLoginAdminId());
-                   flag = salesOrderService.noticeDistribution(newOrder);
+                   flag = salesOrderService.noticeDistribution(newOrder,admin.getAdminId());
                    if(flag < 1){
                        errorId.append(salesOrder.getSalesDealCode()).append(",");
                    }
@@ -1135,7 +1137,7 @@ public class AdminSalesOrderController {
                        newOrder = suSalesOrder(newOrder);
                        /*判断主订单是否是其它订单的子订单 2019-10-08新需求     end*/
                        newOrder.setTrackingAdminId(AdminUtils.getLoginAdminId());
-                       flag = salesOrderService.noticeDistribution(newOrder);
+                       flag = salesOrderService.noticeDistribution(newOrder,admin.getAdminId());
                        if(flag < 1){
                            errorId.append(so.getSalesDealCode()).append(",");
                        }
@@ -1683,6 +1685,8 @@ public class AdminSalesOrderController {
             responseJson.setResultMsg("主订单交易号为空！");
             return responseJson;
         }
+        // 登陆的用户
+        Admin admin = AdminUtils.getLoginAdmin();
 
         //判断主订单信息
         boolean fl = true;
@@ -1748,7 +1752,7 @@ public class AdminSalesOrderController {
         }
 
         try {
-            Integer flag = salesOrderService.splitOrder(mainOrderId,salesOrderList);
+            Integer flag = salesOrderService.splitOrder(mainOrderId,salesOrderList,admin.getAdminId());
             if(flag < 1){
                 responseJson.setResultMsg("拆单订单失败！");
                 return responseJson;

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

@@ -729,7 +729,7 @@ public class AwaitSendController {
 
         //添加操作跟踪信息
         OrderTracking orderTracking = new OrderTracking();
-        orderTracking.setAdminId(salesOrder.getSalesAdminId());
+        orderTracking.setAdminId(AdminUtils.getLoginAdminId());
         orderTracking.setSalesDealCode(salesOrder.getSalesDealCode());
         orderTracking.setTrackingDesc("订单出库");
         salesOrderService.addTracking(orderTracking);