更新快递单号操作记录

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -1134,13 +1134,16 @@ public class OrderController extends BaseController {
                 }else {
                 }else {
                     integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime);
                     integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime);
                 }
                 }
-
-
             }
             }
             if (integer == 1) {
             if (integer == 1) {
                 number++;
                 number++;
                 String id = orderMapper.selectIdByOrderNumber(orderNumber);
                 String id = orderMapper.selectIdByOrderNumber(orderNumber);
-                appMapper.inserOrderHis(id, "发货中，快递方式：" + sendType, new Date(), user.getName());
+                if("快递".equals(map.get("b").toString())) {
+                    appMapper.inserOrderHis(id, "发货中，快递公司：" + company + "，快递单号：" + kuaidiOrder, new Date(), user.getName());
+                }else{
+                    appMapper.inserOrderHis(id, "发货中，快递方式：" + sendType, new Date(), user.getName());
+                }
+
             } else {
             } else {
                 error.append("第" + (i + 1) + "行的更新失败,");
                 error.append("第" + (i + 1) + "行的更新失败,");
             }
             }