思迅配置相关接口问题修复
This commit is contained in:
parent
de30b1b259
commit
d8bca69767
@ -8,17 +8,22 @@ import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import static com.baomidou.mybatisplus.annotation.FieldStrategy.NOT_EMPTY;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@NoArgsConstructor
|
||||
@TableName("product_mapping")
|
||||
@ApiModel("商品映射实体")
|
||||
public class ProductMapping implements Serializable {
|
||||
|
||||
@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.util.Date;
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("shop_image_mapping_temp")
|
||||
@ApiModel("商品图片映射临时表")
|
||||
public class ShopImageMappingTemp {
|
||||
|
||||
@ -8,11 +8,15 @@ import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("store_db_config")
|
||||
@ApiModel(value = "StoreDbConfig对象", description = "店铺数据库连接配置表")
|
||||
public class StoreDbConfig implements Serializable {
|
||||
|
||||
@ -2,6 +2,7 @@ package com.suisung.mall.shop.sync.controller;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.json.JSONArray;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.suisung.mall.common.api.CommonResult;
|
||||
@ -74,7 +75,7 @@ public class ProductMappingController extends BaseControllerImpl {
|
||||
if (productMapping == null|| null==productMapping.getId()) {
|
||||
return CommonResult.failed("id不能为空");
|
||||
}
|
||||
return CommonResult.success(productMappingService.getById(productMapping.getId()));
|
||||
return CommonResult.success(productMappingService.getOne(new QueryWrapper<>(productMapping).eq("id", productMapping.getId())));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
package com.suisung.mall.shop.sync.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.suisung.mall.common.api.CommonResult;
|
||||
import com.suisung.mall.common.modules.product.ShopProductBase;
|
||||
import com.suisung.mall.common.modules.sync.ProductMapping;
|
||||
import com.suisung.mall.core.web.service.IBaseService;
|
||||
import com.suisung.mall.shop.sync.exelModel.ImportResult;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface ProductMappingService extends IService<ProductMapping> {
|
||||
public interface ProductMappingService extends IBaseService<ProductMapping> {
|
||||
|
||||
CommonResult findPageProductMapping(ProductMapping productMapping,Integer pageNum,Integer pageSize);
|
||||
|
||||
|
||||
@ -8,16 +8,13 @@
|
||||
|
||||
package com.suisung.mall.shop.sync.service;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.suisung.mall.common.api.CommonResult;
|
||||
import com.suisung.mall.common.modules.sync.StoreDbConfig;
|
||||
import com.suisung.mall.common.modules.sync.SyncApp;
|
||||
import com.suisung.mall.common.pojo.res.ThirdApiRes;
|
||||
import com.suisung.mall.core.web.service.IBaseService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface StoreDbConfigService extends IService<StoreDbConfig> {
|
||||
public interface StoreDbConfigService extends IBaseService<StoreDbConfig> {
|
||||
|
||||
CommonResult findStoreDbConfigPageList(StoreDbConfig storeDbConfig, Integer pageNum, Integer pageSize);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user