提交diam

service/src/main/java/com/hfkj/service/impl/BsDeviceOrderServiceImpl.java

@@ -138,6 +138,8 @@ public class BsDeviceOrderServiceImpl implements BsDeviceOrderService {
                 if (device.getStoreId() != null) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "设备编号："+device.getDeviceNo() + "无法分配，已分配给" + device.getStoreName());
                 }
+                device.setSalesmanId(order.getSalesmanId());
+                device.setSalesmanName(order.getSalesmanName());
                 device.setMerId(order.getMerId());
                 device.setMerName(order.getMerName());
                 device.setStoreId(order.getStoreId());
@@ -194,6 +196,8 @@ public class BsDeviceOrderServiceImpl implements BsDeviceOrderService {
                 if (!payQrCode.getStatus().equals(PayQrCodeStatusEnum.status1.getNumber())) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "支付码状态错误");
                 }
+                payQrCode.setSalesmanId(order.getSalesmanId());
+                payQrCode.setSalesmanName(order.getSalesmanName());
                 payQrCode.setStoreId(order.getStoreId());
                 payQrCode.setStoreName(order.getStoreName());
                 payQrCode.setStoreBindTime(new Date());
@@ -201,7 +205,6 @@ public class BsDeviceOrderServiceImpl implements BsDeviceOrderService {
                 payQrCode.setMerName(order.getMerName());
                 payQrCodeService.editData(payQrCode, null);
 
-
                 BsDeviceOrderAssign orderAssign = new BsDeviceOrderAssign();
                 orderAssign.setOrderId(order.getId());
                 orderAssign.setOrderNo(order.getOrderNo());