商品模块代码提交
This commit is contained in:
@@ -33,7 +33,6 @@ public class OrderMqListener {
|
|||||||
try {
|
try {
|
||||||
orderInfoRpcService.paySuccessCallback(Long.valueOf(orderId));
|
orderInfoRpcService.paySuccessCallback(Long.valueOf(orderId));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
|
||||||
log.error("订单支付成功扣减库存失败", e);
|
log.error("订单支付成功扣减库存失败", e);
|
||||||
String errorInfo = ExceptionUtil.stacktraceToString(e);
|
String errorInfo = ExceptionUtil.stacktraceToString(e);
|
||||||
mqLog.setErrInfo(errorInfo);
|
mqLog.setErrInfo(errorInfo);
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ public class OrderInfoRpcServiceImpl implements OrderInfoRpcService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
//@GlobalTransactional
|
@GlobalTransactional
|
||||||
public void paySuccessCallback(Long orderId) {
|
public void paySuccessCallback(Long orderId) {
|
||||||
// 下单后商品库存扣减,耗材扣减,流水记录
|
// 下单后商品库存扣减,耗材扣减,流水记录
|
||||||
OrderInfo orderInfo = orderInfoMapper.selectOneById(orderId);
|
OrderInfo orderInfo = orderInfoMapper.selectOneById(orderId);
|
||||||
|
|||||||
@@ -36,5 +36,5 @@ public interface ProductMapper extends BaseMapper<Product> {
|
|||||||
|
|
||||||
List<Product> selectCouponProBySaleNum();
|
List<Product> selectCouponProBySaleNum();
|
||||||
|
|
||||||
void updateProductStockNum(@Param("id") Long id, @Param("shopId") Long shopId, @Param("num") String type, @Param("num") BigDecimal num);
|
void updateProductStockNum(@Param("id") Long id, @Param("shopId") Long shopId, @Param("type") String type, @Param("num") BigDecimal num);
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,6 @@ import com.czg.product.entity.ProdConsRelation;
|
|||||||
import com.czg.product.enums.InOutItemEnum;
|
import com.czg.product.enums.InOutItemEnum;
|
||||||
import com.czg.product.enums.InOutTypeEnum;
|
import com.czg.product.enums.InOutTypeEnum;
|
||||||
import com.czg.product.service.ProductRpcService;
|
import com.czg.product.service.ProductRpcService;
|
||||||
import com.czg.sa.StpKit;
|
|
||||||
import com.czg.service.product.mapper.ConsInfoMapper;
|
import com.czg.service.product.mapper.ConsInfoMapper;
|
||||||
import com.czg.service.product.mapper.ConsStockFlowMapper;
|
import com.czg.service.product.mapper.ConsStockFlowMapper;
|
||||||
import com.czg.service.product.mapper.ProdConsRelationMapper;
|
import com.czg.service.product.mapper.ProdConsRelationMapper;
|
||||||
@@ -56,7 +55,6 @@ public class ProductRpcServiceImpl implements ProductRpcService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
//@GlobalTransactional
|
|
||||||
@CacheEvict(value = {CacheConstant.USER_CLIENT_HOTS_PRODUCT, CacheConstant.USER_CLIENT_GROUPS_PRODUCT}, key = "#shopId", allEntries = true, beforeInvocation = true)
|
@CacheEvict(value = {CacheConstant.USER_CLIENT_HOTS_PRODUCT, CacheConstant.USER_CLIENT_GROUPS_PRODUCT}, key = "#shopId", allEntries = true, beforeInvocation = true)
|
||||||
public void paySuccessSubtractStock(Long shopId, Long orderId, List<Map<String, Object>> dataList) {
|
public void paySuccessSubtractStock(Long shopId, Long orderId, List<Map<String, Object>> dataList) {
|
||||||
List<ProductStockSubtractDTO> list = BeanUtil.copyToList(dataList, ProductStockSubtractDTO.class);
|
List<ProductStockSubtractDTO> list = BeanUtil.copyToList(dataList, ProductStockSubtractDTO.class);
|
||||||
@@ -105,10 +103,6 @@ public class ProductRpcServiceImpl implements ProductRpcService {
|
|||||||
consStockFlow.setProductId(dto.getProductId());
|
consStockFlow.setProductId(dto.getProductId());
|
||||||
//consStockFlow.setSkuId(0L);
|
//consStockFlow.setSkuId(0L);
|
||||||
consStockFlow.setOrderId(orderId);
|
consStockFlow.setOrderId(orderId);
|
||||||
Long createUserId = StpKit.USER.getLoginIdAsLong();
|
|
||||||
String createUserName = StpKit.USER.getAccount();
|
|
||||||
consStockFlow.setCreateUserId(createUserId);
|
|
||||||
consStockFlow.setCreateUserName(createUserName);
|
|
||||||
consStockFlowMapper.insert(consStockFlow);
|
consStockFlowMapper.insert(consStockFlow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -164,10 +158,6 @@ public class ProductRpcServiceImpl implements ProductRpcService {
|
|||||||
consStockFlow.setProductId(dto.getProductId());
|
consStockFlow.setProductId(dto.getProductId());
|
||||||
//consStockFlow.setSkuId(0L);
|
//consStockFlow.setSkuId(0L);
|
||||||
consStockFlow.setOrderId(orderId);
|
consStockFlow.setOrderId(orderId);
|
||||||
Long createUserId = StpKit.USER.getLoginIdAsLong();
|
|
||||||
String createUserName = StpKit.USER.getAccount();
|
|
||||||
consStockFlow.setCreateUserId(createUserId);
|
|
||||||
consStockFlow.setCreateUserName(createUserName);
|
|
||||||
consStockFlowMapper.insert(consStockFlow);
|
consStockFlowMapper.insert(consStockFlow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user