Browse Source

feat:订单下单前金额校验

muti_db
Yen 12 months ago
parent
commit
930559cfa7
  1. 2
      src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
  2. 49
      src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

2
src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java

@ -247,7 +247,7 @@ public class GoodsSkuController {
return R.errorNotFound(); return R.errorNotFound();
} }
param.setId(sku.getId()); param.setId(sku.getId());
if(param.getBelong().contains("产")){ if(param.getBelong()!=null&&param.getBelong().contains("产")){
param.setBelong(param.getBelong().replace("产","")); param.setBelong(param.getBelong().replace("产",""));
} }
goodsSkuService.updateById(param); goodsSkuService.updateById(param);

49
src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BizType;
import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.model.enums.SystemModule;
import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.AuthContextUtils;
import com.qs.serve.common.util.CollectionUtil; import com.qs.serve.common.util.CollectionUtil;
import com.qs.serve.common.util.JsonUtil;
import com.qs.serve.common.util.PageUtil; import com.qs.serve.common.util.PageUtil;
import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.entity.BmsSupplier;
import com.qs.serve.modules.bms.entity.BmsSupplierAddress; import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
@ -17,6 +18,8 @@ import com.qs.serve.modules.goods.entity.GoodsCategory;
import com.qs.serve.modules.goods.entity.GoodsImminentBatch; import com.qs.serve.modules.goods.entity.GoodsImminentBatch;
import com.qs.serve.modules.goods.entity.GoodsSku; import com.qs.serve.modules.goods.entity.GoodsSku;
import com.qs.serve.modules.goods.entity.GoodsSpu; import com.qs.serve.modules.goods.entity.GoodsSpu;
import com.qs.serve.modules.goods.entity.dto.InventoryCusPrice;
import com.qs.serve.modules.goods.entity.so.InventoryCusPriceQuery;
import com.qs.serve.modules.goods.mapper.GoodsImminentBatchMapper; import com.qs.serve.modules.goods.mapper.GoodsImminentBatchMapper;
import com.qs.serve.modules.goods.service.GoodsCategoryRuleService; import com.qs.serve.modules.goods.service.GoodsCategoryRuleService;
import com.qs.serve.modules.goods.service.GoodsCategoryService; import com.qs.serve.modules.goods.service.GoodsCategoryService;
@ -33,6 +36,7 @@ import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
import com.qs.serve.modules.sys.entity.SysUser; import com.qs.serve.modules.sys.entity.SysUser;
import com.qs.serve.modules.sys.service.SysPostUserService; import com.qs.serve.modules.sys.service.SysPostUserService;
import com.qs.serve.modules.sys.service.SysUserService; import com.qs.serve.modules.sys.service.SysUserService;
import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -68,6 +72,51 @@ public class OmsOrderApi {
private GoodsImminentBatchMapper goodsImminentBatchMapper; private GoodsImminentBatchMapper goodsImminentBatchMapper;
private OmsOrderPart1Service omsOrderPart1Service; private OmsOrderPart1Service omsOrderPart1Service;
/**
* 查询客户特殊加
* @param query
* @return
*/
@PostMapping("queryCusPrices")
public R<List<InventoryCusPrice>> queryCusPrices(@RequestBody InventoryCusPriceQuery query){
R<String> res = seeYonRequestBaseService.postBase(TbsSeeYonConst.ERP_CUS_INV_PRICE,query,"查询客户特殊价");
if(res.getStatus().equals(200)) {
List<InventoryCusPrice> inventoryCusPrices = JsonUtil.jsonToList(res.getData(), InventoryCusPrice.class);
return R.ok(inventoryCusPrices);
}
return R.ok();
}
/**
* 传入订单ID返回订单每一项的sku单价,在前端校验商品价格
* @param orderId
* @return 返回错误的价格商品
*/
@GetMapping("checkOrderPrice")
public R<List<InventoryCusPrice>> checkOrderPrice(String orderId){
List<OmsOrderItem> orderItemList = omsOrderItemService.list(new LambdaQueryWrapper<OmsOrderItem>()
.eq(OmsOrderItem::getOrderId,orderId));
OmsOrder order = omsOrderService.getById(orderId);
String cusCode = order.getSupplierCode();
List<String> skuCodes = orderItemList.stream().map(OmsOrderItem::getSkuCode).collect(Collectors.toList());
InventoryCusPriceQuery query = new InventoryCusPriceQuery();
query.setCusCode(cusCode);
query.setInvCodes(skuCodes);
R<String> res = seeYonRequestBaseService.postBase(TbsSeeYonConst.ERP_CUS_INV_PRICE,query,"查询客户特殊价");
List<InventoryCusPrice> errList = new ArrayList<>();
if(res.getStatus().equals(200)){
List<InventoryCusPrice> inventoryCusPrices = JsonUtil.jsonToList(res.getData(), InventoryCusPrice.class);
for (InventoryCusPrice cusPrice : inventoryCusPrices) {
for (OmsOrderItem orderItem : orderItemList) {
if(cusPrice.getCusCode().equals(orderItem.getSkuCode())&&cusPrice.getPrice().compareTo(cusPrice.getPrice())!=0){
errList.add(cusPrice);
}
}
}
}
return R.ok(errList);
}
/** /**
* 确认订单 * 确认订单
* @param confirmOrder * @param confirmOrder

Loading…
Cancel
Save