fix："优化商户入网接口"

src/main/java/com/szwl/config/MqttConfig.java

@@ -117,7 +117,7 @@ public class MqttConfig {
             // 建立连接
             mqttClient.connect(options);
             // 订阅主题
-//            if (serverAddress.equals("10.0.0.153")) {
+            if (serverAddress.equals("10.0.0.153")) {
                 mqttTopicsService.list().forEach(topic -> {
                     try {
                         mqttClient.subscribe(topic.getTopic(), topic.getQos());
@@ -125,7 +125,7 @@ public class MqttConfig {
                         throw new RuntimeException(e);
                     }
                 });
-//            }
+            }
             log.info("MQTT客户端已连接，客户端ID：{}", clientId);
         } catch (MqttException e) {
             log.info("MQTT客户端连接失败");

src/main/java/com/szwl/controller/PurseController.java

@@ -281,14 +281,10 @@ public class PurseController {
         return R.ok(licenseDTO);
     }
 
-
-
-//    @ApiOperation("查询用户证照")
-//    @GetMapping("/userLicense")
-//    public ResponseModel<?> userLicense(Long adminId) {
-//        UserLicense userLicense = userLicenseService.getById(adminId);
-//        byte[] businessLicense = userLicense.getIdCardBack();
-//        String string = "data:image/jpeg;base64,"+ Base64.getEncoder().encodeToString(businessLicense);
-//        return R.ok(string);
-//    }
+    @ApiOperation("查询用户证照")
+    @GetMapping("/userLicense")
+    public ResponseModel<?> userLicense(Long adminId) {
+        UserLicense userLicense = userLicenseService.getById(adminId);
+        return R.ok(userLicense);
+    }
 }

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -311,6 +311,8 @@ public class TEquipmentController {
                 equipmentDTO.setDiyFlowerStatus(equipmentDesc.getDiyFlowerStatus());
                 equipmentDTO.setWorkingMode(equipmentDesc.getWorkingMode());
                 equipmentDTO.setCleanFunction(equipmentDesc.getCleanFunction());
+                equipmentDTO.setTaxStatus(equipmentDesc.getTaxStatus());
+                equipmentDTO.setTaxRate(equipmentDesc.getTaxRate());
             }
 
         }

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -271,12 +271,11 @@ public class TJoinpayMchController {
                 return R.ok();
             case 1:
                 // 提交结算信息
-                BeanUtil.copyProperties(joinpayMch, tJoinpayMch,
-                        CopyOptions.create()
-                                .setIgnoreNullValue(true)  // 忽略源对象中的 null 值
-                                .setIgnoreError(true)     // 忽略类型不匹配等错误
-                                .setIgnoreProperties("id", "createDate", "altMchNo")
-                );
+                tJoinpayMch.setBankAccountType(joinpayMch.getBankAccountType());
+                tJoinpayMch.setBankAccountName(joinpayMch.getBankAccountName());
+                tJoinpayMch.setBankAccountNo(joinpayMch.getBankAccountNo());
+                tJoinpayMch.setBankChannelNo(joinpayMch.getBankChannelNo());
+                tJoinpayMch.setSettMode(joinpayMch.getSettMode());
                 tJoinpayMch.setBindingSteps(2);
                 tJoinpayMch.setModifyDate(new Date());
                 tJoinpayMchService.updateById(tJoinpayMch);

src/main/java/com/szwl/model/bean/TEquipmentDTO.java

@@ -11,6 +11,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -109,6 +110,12 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "清洗功能，0：关闭，1：开启，默认关闭")
     private Boolean cleanFunction;
 
+    @ApiModelProperty(value = "税费收取功能，0：关闭，1：开启，默认关闭")
+    private Boolean taxStatus;
+
+    @ApiModelProperty(value = "税率")
+    private BigDecimal taxRate;
+
     public void setOccurrenceTime(Date occurrenceTime) {
         if(null != occurrenceTime){
             this.hasTodayAlarm = DateUtils.isSameDay(new Date(),occurrenceTime);