|
|
@@ -45,6 +45,7 @@ import com.fs.erp.service.IErpOrderService;
|
|
|
import com.fs.huifuPay.domain.HuiFuRefundResult;
|
|
|
import com.fs.huifuPay.sdk.opps.core.request.V2TradePaymentScanpayRefundRequest;
|
|
|
import com.fs.huifuPay.service.HuiFuService;
|
|
|
+import com.fs.kingbos.service.K9OrderService;
|
|
|
import com.fs.pay.pay.domain.RefundResult;
|
|
|
import com.fs.pay.pay.service.PayService;
|
|
|
import com.fs.store.config.StoreConfig;
|
|
|
@@ -453,46 +454,20 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
//计算金额
|
|
|
FsStoreOrderComputeDTO dto=this.computedOrder(userId, computedParam);
|
|
|
String cartIds = redisCache.getCacheObject("orderKey:" + param.getOrderKey());
|
|
|
- Integer totalNum = 0;
|
|
|
+// Integer totalNum = 0;
|
|
|
BigDecimal integral = BigDecimal.ZERO;
|
|
|
if(cartIds!=null){
|
|
|
//获取购物车列表
|
|
|
List<FsStoreCartQueryVO> carts = redisCache.getCacheObject("orderCarts:" + param.getOrderKey());
|
|
|
//获取地址
|
|
|
FsUserAddress address=userAddressMapper.selectFsUserAddressById(param.getAddressId());
|
|
|
- //检测库存
|
|
|
- //三种特定产品发YDSP001
|
|
|
- int ydspHouse = 0;
|
|
|
- //如果是美乳产品，发武汉仓库
|
|
|
- Integer meiruCount=0;
|
|
|
- for (FsStoreCartQueryVO cart : carts) {
|
|
|
-// cartService.checkProductStock( cart.getProductId(),cart.getProductAttrValueId());
|
|
|
- totalNum += cart.getCartNum();
|
|
|
- integral = NumberUtil.add(integral,
|
|
|
- NumberUtil.mul(cart.getCartNum(), cart.getIntegral()));
|
|
|
-// if(cart.getCateId()!=null&&cart.getCateId().equals(176L)){
|
|
|
-// meiruCount++;
|
|
|
-// }
|
|
|
- //判断是否是三种特定产品
|
|
|
- if(cart.getProductId()!=null&&(cart.getProductId().equals(3168L)||cart.getProductId().equals(3184L)||cart.getProductId().equals(3185L))){
|
|
|
- ydspHouse++;
|
|
|
- }
|
|
|
- }
|
|
|
//生成分布式唯一值
|
|
|
String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
|
|
|
//是否使用积分
|
|
|
Boolean isIntegral=false;
|
|
|
//组合数据
|
|
|
FsStoreOrder storeOrder = new FsStoreOrder();
|
|
|
-
|
|
|
- //修改默认仓库
|
|
|
- if(ydspHouse>0){
|
|
|
-// storeOrder.setStoreHouseCode("WHSP001");
|
|
|
- storeOrder.setStoreHouseCode("YDSP001");
|
|
|
- }
|
|
|
- else{
|
|
|
- storeOrder.setStoreHouseCode("CQDS001");
|
|
|
- }
|
|
|
+ storeOrder.setStoreHouseCode("CK01");
|
|
|
storeOrder.setCompanyId(param.getCompanyId());
|
|
|
storeOrder.setCompanyUserId(param.getCompanyUserId());
|
|
|
if(param.getCompanyUserId()!=null){
|
|
|
@@ -586,13 +561,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
if (flag==0) {
|
|
|
return R.error("订单创建失败");
|
|
|
}
|
|
|
- //收款单更新
|
|
|
-// if(param.getPaymentId()!=null&¶m.getPaymentId()>0){
|
|
|
-// FsStorePayment payment=new FsStorePayment();
|
|
|
-// payment.setOrderId(storeOrder.getId());
|
|
|
-// payment.setPaymentId(param.getPaymentId());
|
|
|
-// paymentService.updateFsStorePayment(payment);
|
|
|
-// }
|
|
|
//使用了积分扣积分
|
|
|
if (dto.getUsedIntegral() > 0) {
|
|
|
this.decIntegral(userId, dto.getUsedIntegral(), dto.getDeductionPrice().doubleValue(),storeOrder.getId().toString());
|
|
|
@@ -966,7 +934,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
.isBuy(0)
|
|
|
.build();
|
|
|
storeCart.setCreateTime(new Date());
|
|
|
-// cartService.checkProductStock(productAttrValue.getProductId(),storeCart.getProductAttrValueId());
|
|
|
+ cartService.checkProductStock(productAttrValue.getProductId(),storeCart.getProductAttrValueId());
|
|
|
cartService.insertFsStoreCart(storeCart);
|
|
|
cartIds.add(storeCart.getId().toString());
|
|
|
}
|
|
|
@@ -1089,7 +1057,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- //cartService.checkProductStock(attrValue.getProductId(),attrValue.getId(), goods.getCount() );
|
|
|
+ cartService.checkProductStock(attrValue.getProductId(),attrValue.getId());
|
|
|
}
|
|
|
//生成分布式唯一值
|
|
|
String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
|
|
|
@@ -1365,14 +1333,18 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
}
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private K9OrderService k9OrderService;
|
|
|
@Override
|
|
|
public void createOmsOrder(Long orderId) throws ParseException {
|
|
|
FsStoreOrder order=fsStoreOrderMapper.selectFsStoreOrderById(orderId);
|
|
|
if(!StringUtils.isEmpty(order.getExtendOrderId())&&order.getStatus()!=1){
|
|
|
return;
|
|
|
}
|
|
|
- ErpOrder erpOrder = getErpOrder(order);
|
|
|
- ErpOrderResponse response= erpOrderService.addOrder(erpOrder);
|
|
|
+// ErpOrder erpOrder = getErpOrder(order);
|
|
|
+// ErpOrderResponse response= erpOrderService.addOrder(erpOrder);
|
|
|
+ ErpOrderResponse response= k9OrderService.addOmsOrder(order.getId());
|
|
|
+
|
|
|
//写入日志
|
|
|
logger.info("ErpCreate:"+order.getOrderCode()+":"+JSONUtil.toJsonStr(response));
|
|
|
//支付成功后 将订单号写入待发货的REDIS中
|
