Merge branch 'develop' into develop-kjf

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMachineServiceImpl.java

@@ -56,7 +56,7 @@ public class KxsMachineServiceImpl extends ServiceImpl<KxsMachineMapper, KxsMach
         for (String field : changeFieldList) {
 
             switch (field) {
-                case "UserId":
+                case "BuyUserId":
                     int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
                     if(userId > 0){
                         machine.setStatus(1);

kxs-transfer/src/main/java/com/kxs/transfer/api/service/product/impl/KxsMerchantServiceImpl.java

@@ -54,7 +54,7 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
             switch (field) {
                 case "UserId":
                     int userId = Integer.parseInt(validFieldDataMap.get(field).toString());
-                    merchant.setUserId(userId);
+                    merchant.setMakerUserId(userId);
                     break;
                 case "MerchantNo":
                     merchant.setMerchantNo(validFieldDataMap.get(field).toString());
@@ -76,11 +76,9 @@ public class KxsMerchantServiceImpl extends ServiceImpl<KxsMerchantMapper, KxsMe
                     KxsMachine kxsMachine = kxsMachineService.getOne(Wrappers.<KxsMachine>lambdaQuery().eq(KxsMachine::getPosSn, sn));
                     if(kxsMachine != null){
                         merchant.setMachineId(kxsMachine.getId());
+                        merchant.setUserId(kxsMachine.getUserId());
                     }
                     break;
-                case "MerUserId":
-                    merchant.setMakerUserId(Integer.valueOf(validFieldDataMap.get(field).toString()));
-                    break;
                 case "MerUserType":
                     merchant.setIsMaker(Integer.valueOf(validFieldDataMap.get(field).toString()));
                     break;