|
@@ -659,6 +659,11 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
|
|
|
if (accountInfo != null) {
|
|
|
operator = accountInfo.getAccountName();
|
|
|
staffId = accountInfo.getStaffId() == null ? 0 : accountInfo.getStaffId();
|
|
|
+
|
|
|
+ if (param.getStaffId() != null && param.getStaffId() > 0) {
|
|
|
+ staffId = param.getStaffId();
|
|
|
+ }
|
|
|
+
|
|
|
storeId = accountInfo.getStoreId();
|
|
|
merchantId = accountInfo.getMerchantId();
|
|
|
if (storeId <= 0) {
|