交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/service/impl/BizDistributorServiceImpl.java

@@ -93,6 +93,9 @@ public class BizDistributorServiceImpl implements IBizDistributorService
         assertDistributorNameUnique(row.getDistributorName(), row.getId());
         assertIdentityNoUnique(row.getIdentityNo(), row.getId());
         row.setDelFlag(DistributorRules.DEL_FLAG_NORMAL);
+        row.setAccountAssigned(db.getAccountAssigned());
+        row.setSysUserId(db.getSysUserId());
+        row.setAssignedLoginName(db.getAssignedLoginName());
         return bizDistributorMapper.updateBizDistributor(row);
     }
 

baqing-admin/src/main/java/com/ruoyi/web/modules/trading/service/impl/BizSupplierServiceImpl.java

@@ -94,6 +94,9 @@ public class BizSupplierServiceImpl implements IBizSupplierService
         assertSupplierNameUnique(row.getSupplierName(), row.getId());
         assertIdentityNoUnique(row.getIdentityNo(), row.getId());
         row.setDelFlag(SupplierRules.DEL_FLAG_NORMAL);
+        row.setAccountAssigned(db.getAccountAssigned());
+        row.setSysUserId(db.getSysUserId());
+        row.setAssignedLoginName(db.getAssignedLoginName());
         return bizSupplierMapper.updateBizSupplier(row);
     }
 

baqing-admin/src/test/java/com/ruoyi/web/modules/trading/service/impl/BizDistributorServiceImplTest.java

@@ -73,6 +73,31 @@ class BizDistributorServiceImplTest
         verify(mapper, never()).insertBizDistributor(any());
     }
 
+    @Test
+    @DisplayName("修改保留账号分配字段")
+    void updatePreservesAccountFields()
+    {
+        BizDistributor db = sampleRow();
+        db.setId(3L);
+        db.setDistributorCode("03");
+        db.setAccountAssigned(TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES);
+        db.setSysUserId(200L);
+        db.setAssignedLoginName("cxs3");
+        when(mapper.selectBizDistributorById(3L)).thenReturn(db);
+        when(mapper.countBizDistributorByNameExcludeId(any(), eq(3L))).thenReturn(0);
+        when(mapper.countBizDistributorByIdentityNoExcludeId(any(), eq(3L))).thenReturn(0);
+        when(mapper.updateBizDistributor(any())).thenReturn(1);
+
+        BizDistributor in = sampleRow();
+        in.setId(3L);
+        assertEquals(1, service.updateBizDistributor(in));
+
+        verify(mapper).updateBizDistributor(argThat(r ->
+                TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES == r.getAccountAssigned()
+                        && Long.valueOf(200L).equals(r.getSysUserId())
+                        && "cxs3".equals(r.getAssignedLoginName())));
+    }
+
     @Test
     @DisplayName("修改禁止改编号")
     void updateCodeImmutable()

baqing-admin/src/test/java/com/ruoyi/web/modules/trading/service/impl/BizSupplierServiceImplTest.java

@@ -78,6 +78,32 @@ class BizSupplierServiceImplTest
         verify(mapper, never()).insertBizSupplier(any());
     }
 
+    @Test
+    @DisplayName("修改保留账号分配字段")
+    void updatePreservesAccountFields()
+    {
+        BizSupplier db = sampleRow();
+        db.setId(3L);
+        db.setSupplierCode("03");
+        db.setAccountAssigned(TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES);
+        db.setSysUserId(200L);
+        db.setAssignedLoginName("gys3");
+        when(mapper.selectBizSupplierById(3L)).thenReturn(db);
+        when(mapper.countBizSupplierByNameExcludeId(any(), eq(3L))).thenReturn(0);
+        when(mapper.countBizSupplierByIdentityNoExcludeId(any(), eq(3L))).thenReturn(0);
+        when(mapper.updateBizSupplier(any())).thenReturn(1);
+
+        BizSupplier in = sampleRow();
+        in.setId(3L);
+        in.setFeeMethod(SupplierRules.FEE_METHOD_PER_ACCOUNT);
+        assertEquals(1, service.updateBizSupplier(in));
+
+        verify(mapper).updateBizSupplier(argThat(r ->
+                TradePartnerAccountRules.ACCOUNT_ASSIGNED_YES == r.getAccountAssigned()
+                        && Long.valueOf(200L).equals(r.getSysUserId())
+                        && "gys3".equals(r.getAssignedLoginName())));
+    }
+
     @Test
     @DisplayName("修改禁止改编号")
     void updateCodeImmutable()