设备激活费用商管端

device-api-service/src/main/java/com/xy/entity/DeviceTypeAlgorithmBeforConfig.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="DeviceTypeAlgorithmBeforConfig对象", description="设备类型算法预充配置")
+@ApiModel(value = "DeviceTypeAlgorithmBeforConfig对象", description = "设备类型算法预充配置")
 public class DeviceTypeAlgorithmBeforConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -33,6 +33,12 @@ public class DeviceTypeAlgorithmBeforConfig implements Serializable {
     @ApiModelProperty(value = "商户id")
     private Long mercId;
 
+    @ApiModelProperty(value = "商户编码")
+    private String mercCode;
+
+    @ApiModelProperty(value = "代理商额外收取金额;单位：分")
+    private Integer extraMoney;
+
     @ApiModelProperty(value = "设备类型")
     private Integer deviceType;
 
@@ -42,6 +48,7 @@ public class DeviceTypeAlgorithmBeforConfig implements Serializable {
     @ApiModelProperty(value = "预充金额;单位：分")
     private Integer money;
 
+
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 

device-api-service/src/main/java/com/xy/service/DeviceTypeAlgorithmBeforConfigServiceImpl.java

@@ -13,11 +13,13 @@ import com.xy.device.EnumAlgorithmTypes;
 import com.xy.dto.AlgorithmDto;
 import com.xy.dto.DeviceAlgorithmChargingDto;
 import com.xy.dto.DeviceTypeAlgorithmBeforConfigDto;
+import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.DeviceTypeAlgorithmBeforConfig;
 import com.xy.entity.SysDictRedis;
 import com.xy.error.CommRuntimeException;
 import com.xy.mapper.DeviceTypeAlgorithmBeforConfigMapper;
+import com.xy.service.be.MercService;
 import com.xy.utils.Emptys;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.R;
@@ -55,6 +57,7 @@ import static com.xy.utils.Beans.copy;
 public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<DeviceTypeAlgorithmBeforConfigMapper, DeviceTypeAlgorithmBeforConfig> implements DeviceTypeAlgorithmBeforConfigService {
 
     private AlgorithmService algorithmService;
+    private MercService mercService;
 
     @Override
     @ApiOperation("对象查询")
@@ -142,6 +145,8 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
         Integer deviceType = save.getDeviceType();
         Long algorithmId = save.getAlgorithmId();
         Long mercId = save.getMercId();
+        MercDto.Vo merc = R.feignCheckData(mercService.obj(new MercDto.Vo().setId(mercId)));
+        String mercCode = merc.getMercCode();
         DeviceTypeAlgorithmBeforConfig dc = this.getOne(Wrappers.<DeviceTypeAlgorithmBeforConfig>lambdaQuery()
                 .eq(DeviceTypeAlgorithmBeforConfig::getMercId, mercId)
                 .eq(DeviceTypeAlgorithmBeforConfig::getAlgorithmId, algorithmId)
@@ -153,7 +158,7 @@ public class DeviceTypeAlgorithmBeforConfigServiceImpl extends ServiceImpl<Devic
         LocalDateTime now = LocalDateTime.now();
         DeviceTypeAlgorithmBeforConfig saveInfo = copy(DeviceTypeAlgorithmBeforConfig.class, save)
                 .setCreateTime(now)
-                .setUpdateTime(now);
+                .setUpdateTime(now).setMercCode(mercCode);
         save(saveInfo);
         return R.ok().setLogMsg(String.format("商户id：%s,算法id：%s,预充金额：%s", save.getMercId(), save.getAlgorithmId(), save.getMoney()));
     }

device-api/src/main/java/com/xy/dto/DeviceTypeAlgorithmBeforConfigDto.java

@@ -89,6 +89,13 @@ public class DeviceTypeAlgorithmBeforConfigDto {
         private LocalDateTime updateTime;
 
 
+        @ApiModelProperty(value = "商户编码")
+        private String mercCode;
+
+        @ApiModelProperty(value = "代理商额外收取金额;单位：分")
+        private Integer extraMoney;
+
+
     }
 
     /**
@@ -183,6 +190,12 @@ public class DeviceTypeAlgorithmBeforConfigDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
+        @ApiModelProperty(value = "商户编码")
+        private String mercCode;
+
+        @ApiModelProperty(value = "代理商额外收取金额;单位：分")
+        private Integer extraMoney;
+
 
     }