修复已知问题

hai-bweb/src/main/java/com/bweb/controller/HighMerchantController.java

@@ -124,7 +124,6 @@ public class HighMerchantController {
                     || StringUtils.isBlank(highMerchant.getMerchantName())
                     || StringUtils.isBlank(highMerchant.getTelephone())
                     || StringUtils.isBlank(highMerchant.getAddress())
-                    || StringUtils.isBlank(highMerchant.getTelephone())
             ) {
                 log.error("HighMerchantController -> updateMerchant() error!","参数错误");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
@@ -156,13 +155,21 @@ public class HighMerchantController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.PHONE_NUM_EXISTED, "");
             }
 
-            highMerchant.setUpdateTime(new Date());
-            highMerchant.setOperatorId(userInfoModel.getSecUser().getId());
-            highMerchant.setOperatorName(userInfoModel.getSecUser().getUserName());
-            highMerchant.setCompanyId(userInfoModel.getBsCompany().getId());
-            highMerchantService.updateMerchant(highMerchant);
-
-            return ResponseMsgUtil.success(highMerchant);
+            merchant.setMerchantName(highMerchant.getMerchantName());
+            merchant.setTelephone(highMerchant.getTelephone());
+            merchant.setAddress(highMerchant.getAddress());
+            merchant.setBankName(highMerchant.getBankName());
+            merchant.setBankHolder(highMerchant.getBankHolder());
+            merchant.setBankAccount(highMerchant.getBankAccount());
+            merchant.setMerchantLogo(highMerchant.getMerchantLogo());
+            merchant.setMerchantDesc(highMerchant.getMerchantDesc());
+            merchant.setUpdateTime(new Date());
+            merchant.setOperatorId(userInfoModel.getSecUser().getId());
+            merchant.setOperatorName(userInfoModel.getSecUser().getUserName());
+            merchant.setCompanyId(userInfoModel.getBsCompany().getId());
+            highMerchantService.updateMerchant(merchant);
+
+            return ResponseMsgUtil.success(merchant);
         } catch (Exception e) {
             log.error("HighMerchantController -> updateMerchant() error!",e);
             return ResponseMsgUtil.exception(e);