fixed 订单显示所属员工

fuint-application/src/main/java/com/fuint/common/dto/UserOrderDto.java

@@ -1,6 +1,7 @@
 package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtRefund;
+import com.fuint.repository.model.MtStaff;
 import com.fuint.repository.model.MtStore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -128,5 +129,8 @@ public class UserOrderDto implements Serializable {
     @ApiModelProperty("使用卡券")
     private UserCouponDto couponInfo;
 
+    @ApiModelProperty("所属员工")
+    private MtStaff staffInfo;
+
 }
 

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -1604,6 +1604,12 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         MtStore storeInfo = storeService.queryStoreById(orderInfo.getStoreId());
         userOrderDto.setStoreInfo(storeInfo);
 
+        // 所属员工
+        if (orderInfo.getStaffId() != null && orderInfo.getStaffId() > 0) {
+            MtStaff staffInfo = staffService.queryStaffById(orderInfo.getStaffId());
+            userOrderDto.setStaffInfo(staffInfo);
+        }
+
         // 下单用户信息直接取会员个人信息
         OrderUserDto userInfo = new OrderUserDto();
         MtUser user = memberService.queryMemberById(orderInfo.getUserId());

fuint-application/src/main/java/com/fuint/common/service/impl/StaffServiceImpl.java

@@ -181,8 +181,10 @@ public class StaffServiceImpl extends ServiceImpl<MtStaffMapper, MtStaff> implem
      */
     @Override
     public MtStaff queryStaffById(Integer id) {
-        MtStaff mtStaff = mtStaffMapper.selectById(id);
-        return mtStaff;
+        if (id == null || id <= 0) {
+            return null;
+        }
+        return mtStaffMapper.selectById(id);
     }
 
     /**