huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

开始更新店铺订单item确认之前你保存商品库skuId；

This commit is contained in:
启航 2026-01-18 12:54:47 +08:00
parent 668690957d
commit 7311e3598b
4 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/qihang-erp.sql
View File

@ -4700,15 +4700,13 @@ CREATE TABLE `oms_wei_order_item` (
`use_deduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否使用了会员积分抵扣\r\n',
`deduction_price` int NULL DEFAULT NULL COMMENT '会员积分抵扣金额，单位为分',
`order_product_coupon_info_list` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商品优惠券信息，逐步替换 order.order_detail.coupon_info',
`o_goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)',
`o_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 35 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of oms_wei_order_item
-- ----------------------------
INSERT INTO `oms_wei_order_item` VALUES (34, 1012, '3731295703781745408', '10000239803737', '3531475359', 'https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SZ/reserved/6839f1ff00015fba288ae5867af20115000000a000004f50', 1, 3990, '雷士照明led吸顶灯灯芯替换圆形灯板节能灯芯冷光高显6W至40W护眼', 0, 0, '', 3990, '[{\"attr_key\":\"规格\",\"attr_value\":\"18W白光\"}]', 3990, NULL, NULL, 'null', 3990, 'null', NULL, '', '{\"stock_type\":0}', '{\"seven_day_return\":1,\"freight_insurance\":0}', 'null', NULL, '[]', NULL, NULL);
INSERT INTO `oms_wei_order_item` VALUES (34, 1012, '3731295703781745408', '10000239803737', '3531475359', 'https://wst.wxapp.tc.qq.com/161/20304/snscosdownload/SZ/reserved/6839f1ff00015fba288ae5867af20115000000a000004f50', 1, 3990, '雷士照明led吸顶灯灯芯替换圆形灯板节能灯芯冷光高显6W至40W护眼', 0, 0, '', 3990, '[{\"attr_key\":\"规格\",\"attr_value\":\"18W白光\"}]', 3990, NULL, NULL, 'null', 3990, 'null', NULL, '', '{\"stock_type\":0}', '{\"seven_day_return\":1,\"freight_insurance\":0}', 'null', NULL, '[]');
-- ----------------------------
-- Table structure for oms_wei_refund

8
model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java
View File

@ -152,15 +152,7 @@ public class WeiOrderItem implements Serializable {
*/
private String orderProductCouponInfoList;
/**
* 商品id(o_goods外键)
*/
private Long oGoodsId;
/**
* 商品skuid(o_goods_sku外键)
*/
private Long oGoodsSkuId;
private static final long serialVersionUID = 1L;
}

27
serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java
View File

@ -100,19 +100,9 @@ public class WeiOrderServiceImpl extends ServiceImpl<WeiOrderMapper, WeiOrder>
// 更新
WeiOrderItem itemUpdate = new WeiOrderItem();
itemUpdate.setId(taoOrderItems.get(0).getId());
List<WeiGoodsSku> skus = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, item.getSkuId()));
if (skus != null && !skus.isEmpty()) {
itemUpdate.setOGoodsId(skus.get(0).getErpGoodsId());
itemUpdate.setOGoodsSkuId(skus.get(0).getErpGoodsSkuId());
}
itemMapper.updateById(itemUpdate);
} else {
// 新增
List<WeiGoodsSku> skus = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, item.getSkuId()));
if (skus != null && !skus.isEmpty()) {
item.setOGoodsId(skus.get(0).getErpGoodsId());
item.setOGoodsSkuId(skus.get(0).getErpGoodsSkuId());
}
item.setShopId(shopId);
item.setOrderId(order.getOrderId());
itemMapper.insert(item);
@ -126,11 +116,7 @@ public class WeiOrderServiceImpl extends ServiceImpl<WeiOrderMapper, WeiOrder>
mapper.insert(order);
// 添加item
for (var item : order.getItems()) {
List<WeiGoodsSku> skus = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, item.getSkuId()));
if (skus != null && !skus.isEmpty()) {
item.setOGoodsId(skus.get(0).getErpGoodsId());
item.setOGoodsSkuId(skus.get(0).getErpGoodsSkuId());
}
item.setShopId(shopId);
item.setOrderId(order.getOrderId());
itemMapper.insert(item);
@ -218,14 +204,21 @@ public class WeiOrderServiceImpl extends ServiceImpl<WeiOrderMapper, WeiOrder>
//插入item
for (var item : pddOrderItems) {
OOrderItem oOrderItem = new OOrderItem();
// 确认订单时查找OGoodsSkuId是否存在
List<WeiGoodsSku> skus = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, item.getSkuId()));
if (skus != null && !skus.isEmpty()) {
oOrderItem.setGoodsId(skus.get(0).getErpGoodsId());
oOrderItem.setGoodsSkuId(skus.get(0).getErpGoodsSkuId());
}else {
return ResultVo.error("店铺商品找不到绑定的商品库商品");
}
oOrderItem.setOrderId(order.getId());
oOrderItem.setOrderNum(order.getOrderNum());
oOrderItem.setSubOrderNum(order.getOrderNum()+"-"+item.getSkuId());
oOrderItem.setShopType(EnumShopType.WEI.getIndex());
oOrderItem.setShopId(weiOrder.getShopId());
oOrderItem.setSkuId(item.getSkuId());
oOrderItem.setGoodsId(item.getOGoodsId()!=null?item.getOGoodsId():0L);
oOrderItem.setGoodsSkuId(item.getOGoodsSkuId()!=null?item.getOGoodsSkuId():0L);
oOrderItem.setGoodsTitle(item.getTitle());
oOrderItem.setGoodsImg(item.getThumbImg());
oOrderItem.setGoodsNum(item.getOutProductId());

5
serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml
View File

@ -32,8 +32,6 @@
<result property="useDeduction" column="use_deduction" jdbcType="VARCHAR"/>
<result property="deductionPrice" column="deduction_price" jdbcType="INTEGER"/>
<result property="orderProductCouponInfoList" column="order_product_coupon_info_list" jdbcType="VARCHAR"/>
<result property="oGoodsId" column="o_goods_id" jdbcType="BIGINT"/>
<result property="oGoodsSkuId" column="o_goods_sku_id" jdbcType="BIGINT"/>
</resultMap>
<sql id="Base_Column_List">
@ -45,7 +43,6 @@
out_product_id,out_sku_id,is_discounted,
estimate_price,is_change_price,change_price,
out_warehouse_id,sku_deliver_info,extra_service,
use_deduction,deduction_price,order_product_coupon_info_list,
o_goods_id,o_goods_sku_id
use_deduction,deduction_price,order_product_coupon_info_list
</sql>
</mapper>