|
|
@@ -203,7 +203,7 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
|
|
|
Map<String,Object> paramMap = Maps.newHashMap();
|
|
|
paramMap.put("keywords",bizCustomer.getYongId());
|
|
|
paramMap.put("pageNum","1");
|
|
|
- paramMap.put("pageSize","10");
|
|
|
+ paramMap.put("pageSize","20");
|
|
|
//根据用户中的用友id字段查询erp那边销售订单
|
|
|
try {
|
|
|
String result = HttpUtil.createPost("https://1072el542wi61.vicp.fun/api/erp/u8data/getsalelist")
|
|
|
@@ -211,69 +211,68 @@ public class BizSaleOrderServiceImpl extends ServiceImpl<BizSaleOrderMapper, Biz
|
|
|
JSONObject jsonObject = JSONObject.parseObject(result);
|
|
|
String resData = jsonObject.getString("resData");
|
|
|
JSONArray jsonArray = JSONObject.parseArray(resData);
|
|
|
- if(ObjectUtil.isNotEmpty(jsonObject)){
|
|
|
- if(jsonArray.size()>0){
|
|
|
- for(int i=0; i<jsonArray.size(); i++){
|
|
|
- JSONObject object = jsonArray.getJSONObject(i);
|
|
|
- String relationId = object.getString("id");
|
|
|
- //订单编号
|
|
|
- String orderCode = object.getString("cSOCode");
|
|
|
- //货品编码
|
|
|
- String goodsCode = object.getString("cInvCode");
|
|
|
- //货品名称
|
|
|
- String goodsName = object.getString("cInvName");
|
|
|
- //订单重量
|
|
|
- BigDecimal weight = new BigDecimal(object.getString("iQuantity"));
|
|
|
- //单价
|
|
|
- BigDecimal price = new BigDecimal(object.getString("iTaxUnitPrice"));
|
|
|
- //业务员
|
|
|
- String businessName = object.getString("cPsn_Name");
|
|
|
- //订单类型
|
|
|
- String transWay = object.getString("transWay");
|
|
|
- //送货地址
|
|
|
- String jAddress = object.getString("jAddress");
|
|
|
- log.info("jAddress送货地址："+jAddress+",订单编号："+orderCode);
|
|
|
- //根据关联id查询销售订单是否存在，不存在插入
|
|
|
- long count = this.count(new QueryWrapper<BizSaleOrder>().lambda().eq(BizSaleOrder::getRelationId, relationId));
|
|
|
- if(count==0){
|
|
|
- BizSaleOrder bizSaleOrder = new BizSaleOrder();
|
|
|
- bizSaleOrder.setSaleOrderNumber(orderCode);
|
|
|
- bizSaleOrder.setSaleGoodsName(goodsName);
|
|
|
- bizSaleOrder.setSaleGoodsCode(goodsCode);
|
|
|
- bizSaleOrder.setSaleOrderWeight(weight.multiply(new BigDecimal(1000)));
|
|
|
- bizSaleOrder.setSaleStatus("1");
|
|
|
- bizSaleOrder.setShipAddress(jAddress);
|
|
|
- if(ObjectUtil.isNotEmpty(transWay)){
|
|
|
- if(StringUtils.equals(transWay,"配送")){
|
|
|
- bizSaleOrder.setSaleOrderType("1");
|
|
|
- }else{
|
|
|
- bizSaleOrder.setSaleOrderType("2");
|
|
|
- }
|
|
|
+ if(jsonArray!=null && jsonArray.size()>0){
|
|
|
+ for(int i=0; i<jsonArray.size(); i++){
|
|
|
+ JSONObject object = jsonArray.getJSONObject(i);
|
|
|
+ String relationId = object.getString("id");
|
|
|
+ //订单编号
|
|
|
+ String orderCode = object.getString("cSOCode");
|
|
|
+ //货品编码
|
|
|
+ String goodsCode = object.getString("cInvCode");
|
|
|
+ //货品名称
|
|
|
+ String goodsName = object.getString("cInvName");
|
|
|
+ //订单重量
|
|
|
+ BigDecimal weight = new BigDecimal(object.getString("iQuantity"));
|
|
|
+ //单价
|
|
|
+ BigDecimal price = new BigDecimal(object.getString("iTaxUnitPrice"));
|
|
|
+ //业务员
|
|
|
+ String businessName = object.getString("cPsn_Name");
|
|
|
+ //订单类型
|
|
|
+ String transWay = object.getString("transWay");
|
|
|
+ //送货地址
|
|
|
+ String jAddress = object.getString("jAddress");
|
|
|
+ log.info("jAddress送货地址："+jAddress+",订单编号："+orderCode);
|
|
|
+ //根据关联id查询销售订单是否存在，不存在插入
|
|
|
+ long count = this.count(new QueryWrapper<BizSaleOrder>().lambda().eq(BizSaleOrder::getRelationId, relationId));
|
|
|
+ if(count==0){
|
|
|
+ BizSaleOrder bizSaleOrder = new BizSaleOrder();
|
|
|
+ bizSaleOrder.setSaleOrderNumber(orderCode);
|
|
|
+ bizSaleOrder.setSaleGoodsName(goodsName);
|
|
|
+ bizSaleOrder.setSaleGoodsCode(goodsCode);
|
|
|
+ bizSaleOrder.setSaleOrderWeight(weight.multiply(new BigDecimal(1000)));
|
|
|
+ bizSaleOrder.setSaleStatus("1");
|
|
|
+ bizSaleOrder.setShipAddress(jAddress);
|
|
|
+ if(ObjectUtil.isNotEmpty(transWay)){
|
|
|
+ if(StringUtils.equals(transWay,"配送")){
|
|
|
+ bizSaleOrder.setSaleOrderType("1");
|
|
|
+ }else{
|
|
|
+ bizSaleOrder.setSaleOrderType("2");
|
|
|
}
|
|
|
- bizSaleOrder.setSaleOrderSouce("1");
|
|
|
- bizSaleOrder.setCustomerId(bizCustomer.getId());
|
|
|
- bizSaleOrder.setRelationId(relationId);
|
|
|
- bizSaleOrder.setSalePrice(price);
|
|
|
- bizSaleOrder.setBusinessName(businessName);
|
|
|
- this.save(bizSaleOrder);
|
|
|
- }
|
|
|
- //添加货品信息
|
|
|
- QueryWrapper<BizGoods> queryWrapper = new QueryWrapper<>();
|
|
|
- if(ObjectUtil.isNotEmpty(goodsCode)){
|
|
|
- queryWrapper.lambda().eq(BizGoods::getGoodsCode,goodsCode);
|
|
|
- }
|
|
|
- if(ObjectUtil.isNotEmpty(goodsName)){
|
|
|
- queryWrapper.lambda().eq(BizGoods::getGoodsName,goodsName);
|
|
|
- }
|
|
|
- long goodCount = bizGoodsService.count(queryWrapper);
|
|
|
- if(goodCount==0){
|
|
|
- BizGoods bizGoods = new BizGoods();
|
|
|
- bizGoods.setGoodsCode(goodsCode);
|
|
|
- bizGoods.setGoodsName(goodsName);
|
|
|
- bizGoodsService.save(bizGoods);
|
|
|
}
|
|
|
+ bizSaleOrder.setSaleOrderSouce("1");
|
|
|
+ bizSaleOrder.setCustomerId(bizCustomer.getId());
|
|
|
+ bizSaleOrder.setRelationId(relationId);
|
|
|
+ bizSaleOrder.setSalePrice(price);
|
|
|
+ bizSaleOrder.setBusinessName(businessName);
|
|
|
+ this.save(bizSaleOrder);
|
|
|
+ }
|
|
|
+ //添加货品信息
|
|
|
+ QueryWrapper<BizGoods> queryWrapper = new QueryWrapper<>();
|
|
|
+ if(ObjectUtil.isNotEmpty(goodsCode)){
|
|
|
+ queryWrapper.lambda().eq(BizGoods::getGoodsCode,goodsCode);
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(goodsName)){
|
|
|
+ queryWrapper.lambda().eq(BizGoods::getGoodsName,goodsName);
|
|
|
+ }
|
|
|
+ long goodCount = bizGoodsService.count(queryWrapper);
|
|
|
+ if(goodCount==0){
|
|
|
+ BizGoods bizGoods = new BizGoods();
|
|
|
+ bizGoods.setGoodsCode(goodsCode);
|
|
|
+ bizGoods.setGoodsName(goodsName);
|
|
|
+ bizGoodsService.save(bizGoods);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
List<BizSaleOrder> list = this.queryByCustomerId(bizSaleOrderIdParam);
|
|
|
return list;
|
|
|
}
|
fanzherong_v