商品映射问题修复
This commit is contained in:
parent
943eb54037
commit
9455a48498
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|||||||
@ -9,6 +9,7 @@ import com.google.gson.reflect.TypeToken;
|
|||||||
import com.suisung.mall.common.api.CommonResult;
|
import com.suisung.mall.common.api.CommonResult;
|
||||||
import com.suisung.mall.common.api.IErrorCode;
|
import com.suisung.mall.common.api.IErrorCode;
|
||||||
import com.suisung.mall.common.domain.UserDto;
|
import com.suisung.mall.common.domain.UserDto;
|
||||||
|
import com.suisung.mall.common.exception.ApiException;
|
||||||
import com.suisung.mall.common.modules.store.ShopStoreBase;
|
import com.suisung.mall.common.modules.store.ShopStoreBase;
|
||||||
import com.suisung.mall.common.modules.sync.ProductMapping;
|
import com.suisung.mall.common.modules.sync.ProductMapping;
|
||||||
import com.suisung.mall.common.pojo.res.ThirdApiRes;
|
import com.suisung.mall.common.pojo.res.ThirdApiRes;
|
||||||
@ -150,7 +151,7 @@ public class ProductMappingController extends BaseControllerImpl {
|
|||||||
return CommonResult.failed("更新失败:店铺不存在");
|
return CommonResult.failed("更新失败:店铺不存在");
|
||||||
}
|
}
|
||||||
productMapping.setStoreName(shopStoreBase.getStore_name());
|
productMapping.setStoreName(shopStoreBase.getStore_name());
|
||||||
if(productMappingService.saveOrUpdate(productMapping)){
|
if(productMappingService.updateById(productMapping)){
|
||||||
return CommonResult.success(true);
|
return CommonResult.success(true);
|
||||||
}
|
}
|
||||||
}else {
|
}else {
|
||||||
@ -227,8 +228,13 @@ public class ProductMappingController extends BaseControllerImpl {
|
|||||||
* @param response
|
* @param response
|
||||||
*/
|
*/
|
||||||
@PostMapping("/exportSelected")
|
@PostMapping("/exportSelected")
|
||||||
public void exportSelectedData(@RequestBody List<Long> ids, HttpServletResponse response) {
|
public void exportSelectedData(@RequestParam("ids") List<Long> ids, HttpServletResponse response) {
|
||||||
List<ProductMapping> data = productMappingService.listByIds(ids);
|
if(ids==null||ids.isEmpty()){
|
||||||
|
throw new ApiException("选择数据不能为空");
|
||||||
|
}
|
||||||
|
QueryWrapper<ProductMapping> queryWrapper = new QueryWrapper<>();
|
||||||
|
queryWrapper.in("id", ids);
|
||||||
|
List<ProductMapping> data = productMappingService.list(queryWrapper);
|
||||||
productMappingService.exportData(response, data);
|
productMappingService.exportData(response, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -85,8 +85,8 @@ public class StoreDbConfigController extends BaseControllerImpl {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@ApiOperation(value = "更新-店铺数据库连接配置", notes = "更新-店铺数据库连接配置")
|
@ApiOperation(value = "更新-店铺数据库连接配置", notes = "更新-店铺数据库连接配置")
|
||||||
@RequestMapping(value = "/udpateStoreDbConfig", method = RequestMethod.PUT)
|
@RequestMapping(value = "/updateStoreDbConfig", method = RequestMethod.PUT)
|
||||||
public CommonResult udpateStoreDbConfig(@RequestBody @Valid StoreDbConfig storeDbConfig) {
|
public CommonResult updateStoreDbConfig(@RequestBody @Valid StoreDbConfig storeDbConfig) {
|
||||||
return storeDbConfigService.updateStoreDbConfig(storeDbConfig);
|
return storeDbConfigService.updateStoreDbConfig(storeDbConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user