diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql index ac13217b..d72da08b 100644 --- a/docs/qihang-erp.sql +++ b/docs/qihang-erp.sql @@ -4742,8 +4742,6 @@ CREATE TABLE `oms_wei_refund` ( `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_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 ) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '视频号小店退款' ROW_FORMAT = DYNAMIC; diff --git a/model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java b/model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java index 8a0f1c34..ff3c9449 100644 --- a/model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java +++ b/model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java @@ -168,15 +168,6 @@ USER_WAIT_HANDLE_MERCHANT_AFTER_SALE 待用户处理商家代发起的售后申 */ private Date pullTime; - /** - * 商品id(o_goods外键) - */ - private Long oGoodsId; - - /** - * 商品skuid(o_goods_sku外键) - */ - private Long oGoodsSkuId; private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java index 52e10879..85239d2e 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java @@ -66,26 +66,26 @@ public class WeiRefundServiceImpl extends ServiceImpl pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(WeiGoodsSku::getSkuId, refund.getSkuId())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - update.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId()); - update.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId()); - } - } +// if(refund.getSkuId()!=null) { +// List pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(WeiGoodsSku::getSkuId, refund.getSkuId())); +// if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { +// update.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId()); +// update.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId()); +// } +// } mapper.updateById(update); return ResultVo.error(ResultVoEnum.DataExist, "退款已经存在,更新成功"); } else { newRefund = refund; // 不存在,新增 - if(refund.getSkuId()!=null) { - List pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(WeiGoodsSku::getSkuId, refund.getSkuId())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - refund.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId()); - refund.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId()); - } - } +// if(refund.getSkuId()!=null) { +// List pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(WeiGoodsSku::getSkuId, refund.getSkuId())); +// if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { +// refund.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId()); +// refund.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId()); +// } +// } refund.setShopId(shopId); mapper.insert(refund); return ResultVo.success();