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

wei订单item、退款表去除o_goods_sku_id字段

This commit is contained in:
启航 2026-01-18 13:05:46 +08:00
parent 7311e3598b
commit e2479e9cb2
3 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/qihang-erp.sql
View File

@ -4742,8 +4742,6 @@ CREATE TABLE `oms_wei_refund` (
`refund_resp` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信支付退款的响应', `refund_resp` varchar(2550) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '微信支付退款的响应',
`pull_status` int NULL DEFAULT NULL COMMENT '推送状态（0未推送；1推送成功；2推送失败）', `pull_status` int NULL DEFAULT NULL COMMENT '推送状态（0未推送；1推送成功；2推送失败）',
`pull_time` datetime NULL DEFAULT NULL COMMENT '订单审核时间', `pull_time` datetime NULL DEFAULT NULL COMMENT '订单审核时间',
`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 PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '视频号小店退款' ROW_FORMAT = DYNAMIC; ) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '视频号小店退款' ROW_FORMAT = DYNAMIC;

9
model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java
View File

@ -168,15 +168,6 @@ USER_WAIT_HANDLE_MERCHANT_AFTER_SALE 待用户处理商家代发起的售后申
*/ */
private Date pullTime; private Date pullTime;
/**
* 商品id(o_goods外键)
*/
private Long oGoodsId;
/**
* 商品skuid(o_goods_sku外键)
*/
private Long oGoodsSkuId;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
} }

28
serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java
View File

@ -66,26 +66,26 @@ public class WeiRefundServiceImpl extends ServiceImpl<WeiRefundMapper, WeiRefund
update.setReturnDeliveryName(refund.getReturnDeliveryName()); update.setReturnDeliveryName(refund.getReturnDeliveryName());
update.setReturnDeliveryId(refund.getReturnDeliveryId()); update.setReturnDeliveryId(refund.getReturnDeliveryId());
update.setComplaintId(refund.getComplaintId()); update.setComplaintId(refund.getComplaintId());
if(refund.getSkuId()!=null) { // if(refund.getSkuId()!=null) {
List<WeiGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, refund.getSkuId())); // List<WeiGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, refund.getSkuId()));
if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { // if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
update.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId()); // update.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId());
update.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId()); // update.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId());
} // }
} // }
mapper.updateById(update); mapper.updateById(update);
return ResultVo.error(ResultVoEnum.DataExist, "退款已经存在，更新成功"); return ResultVo.error(ResultVoEnum.DataExist, "退款已经存在，更新成功");
} else { } else {
newRefund = refund; newRefund = refund;
// 不存在，新增 // 不存在，新增
if(refund.getSkuId()!=null) { // if(refund.getSkuId()!=null) {
List<WeiGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, refund.getSkuId())); // List<WeiGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<WeiGoodsSku>().eq(WeiGoodsSku::getSkuId, refund.getSkuId()));
if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { // if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
refund.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId()); // refund.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId());
refund.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId()); // refund.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId());
} // }
} // }
refund.setShopId(shopId); refund.setShopId(shopId);
mapper.insert(refund); mapper.insert(refund);
return ResultVo.success(); return ResultVo.success();