记得上下班打卡 | git大法好,push需谨慎

Commit ea7c4427 authored by 张国柄's avatar 张国柄

~API:POS机:扫码信息;

parent b76a66ff
...@@ -266,7 +266,7 @@ public class GoblinStoreMgtGoodsController { ...@@ -266,7 +266,7 @@ public class GoblinStoreMgtGoodsController {
paramSkuId, editBefSkuSpecMap, paramSkuSpecList); paramSkuId, editBefSkuSpecMap, paramSkuSpecList);
return ResponseDto.failure(ErrorMapping.get("149014")); return ResponseDto.failure(ErrorMapping.get("149014"));
} }
for (GoblinGoodsSpecDto paramGoodsSpecDto : paramSkuSpecList) { for (GoblinGoodsSpecDto paramGoodsSpecDto : paramSkuSpecList) {// 入参规格逐个与当前商品所有SKU规格比对
String editBefSkuSpecVname = editBefSkuSpecMap.get(paramGoodsSpecDto.getSpecName()); String editBefSkuSpecVname = editBefSkuSpecMap.get(paramGoodsSpecDto.getSpecName());
if (null == editBefSkuSpecVname) {// 入参规格不存在于原SKU中,则参数有误 if (null == editBefSkuSpecVname) {// 入参规格不存在于原SKU中,则参数有误
log.warn("商品管理:商品编辑:SKU编辑:规格信息不一致[skuId={},editBefSkuSpecMap={},paramGoodsSpecDto={}]", log.warn("商品管理:商品编辑:SKU编辑:规格信息不一致[skuId={},editBefSkuSpecMap={},paramGoodsSpecDto={}]",
...@@ -399,22 +399,22 @@ public class GoblinStoreMgtGoodsController { ...@@ -399,22 +399,22 @@ public class GoblinStoreMgtGoodsController {
return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuDel(mgtGoodsSkuInfoVo)); return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuDel(mgtGoodsSkuInfoVo));
} }
@ApiOperationSupport(order = 10) // @ApiOperationSupport(order = 10)
@ApiOperation(value = "商品编辑:SKU批改") // @ApiOperation(value = "商品编辑:SKU批改")
@ApiImplicitParams({ // @ApiImplicitParams({
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"), // @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "storeId", value = "店铺ID"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "商品ID"), // @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "spuId", value = "商品ID"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "batField", value = "批量修改属性"), // @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "batField", value = "批量修改属性"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "batFieldVal", value = "批量修改属性值"), // @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "batFieldVal", value = "批量修改属性值"),
}) // })
@PostMapping("edit_sku/bat") // @PostMapping("edit_sku/bat")
public ResponseDto<Object> editSkuBat(@NotBlank(message = "店铺ID不能为空") String storeId, // public ResponseDto<Object> editSkuBat(@NotBlank(message = "店铺ID不能为空") String storeId,
@NotBlank(message = "商品ID不能为空") String spuId, // @NotBlank(message = "商品ID不能为空") String spuId,
@NotBlank(message = "批量修改属性不能为空") String batField, // @NotBlank(message = "批量修改属性不能为空") String batField,
@NotBlank(message = "批量修改属性值不能为空") String batFieldVal) { // @NotBlank(message = "批量修改属性值不能为空") String batFieldVal) {
if (!goblinRedisUtils.hasStoreId(CurrentUtil.getCurrentUid(), storeId)) { // if (!goblinRedisUtils.hasStoreId(CurrentUtil.getCurrentUid(), storeId)) {
return ResponseDto.failure(ErrorMapping.get("149002")); // return ResponseDto.failure(ErrorMapping.get("149002"));
} // }
return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuBat(spuId, batField, batFieldVal)); // return ResponseDto.success(goblinstoreMgtGoodsService.goodsEditSkuBat(spuId, batField, batFieldVal));
} // }
} }
...@@ -12,10 +12,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -12,10 +12,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
...@@ -34,7 +31,7 @@ public class PlatformAdamProController { ...@@ -34,7 +31,7 @@ public class PlatformAdamProController {
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "pidco", value = "格式[用户QRCODE@演出ID]"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "pidco", value = "格式[用户QRCODE@演出ID]"),
@ApiImplicitParam(type = "form", required = true, dataType = "String", name = "pname", value = "演出名称"), @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "pname", value = "演出名称"),
}) })
@PutMapping(value = {"scanit"}) @PostMapping(value = {"scanit"})
public ResponseDto<AdamProScanitVo> scan(@NotBlank(message = "参数有误") @RequestParam String pidco, public ResponseDto<AdamProScanitVo> scan(@NotBlank(message = "参数有误") @RequestParam String pidco,
@NotBlank(message = "参数有误") @RequestParam String pname) { @NotBlank(message = "参数有误") @RequestParam String pname) {
String[] split = pidco.split("@"); String[] split = pidco.split("@");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment