diff --git a/oms-api/src/main/java/com/qihang/oms/controller/RefundController.java b/oms-api/src/main/java/com/qihang/oms/controller/RefundController.java new file mode 100644 index 00000000..7dd8490e --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/controller/RefundController.java @@ -0,0 +1,46 @@ +package com.qihang.oms.controller; + + +import com.qihang.common.common.AjaxResult; +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.TableDataInfo; +import com.qihang.oms.domain.ErpSaleAfterRefund; +import com.qihang.oms.domain.ErpSaleOrder; +import com.qihang.oms.service.ErpSaleAfterRefundService; +import com.qihang.oms.service.ErpSaleOrderService; +import com.qihang.security.common.BaseController; +import lombok.AllArgsConstructor; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 店铺订单Controller + * + * @author qihang + * @date 2023-12-31 + */ +@AllArgsConstructor +@RestController +@RequestMapping("/refund") +public class RefundController extends BaseController +{ + + private final ErpSaleAfterRefundService refundService; + private final KafkaTemplate kafkaTemplate; + + /** + * 查询店铺订单列表 + */ + @PreAuthorize("@ss.hasPermi('shop:order:list')") + @GetMapping("/list") + public TableDataInfo list(ErpSaleAfterRefund bo, PageQuery pageQuery) + { + var pageList = refundService.queryPageList(bo,pageQuery); + return getDataTable(pageList); + } + +} diff --git a/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterRefund.java b/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterRefund.java new file mode 100644 index 00000000..7273de88 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/domain/ErpSaleAfterRefund.java @@ -0,0 +1,164 @@ +package com.qihang.oms.domain; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 售后退款表 + * @TableName erp_sale_after_refund + */ +@Data +public class ErpSaleAfterRefund implements Serializable { + /** + * + */ + private Long id; + + /** + * 退货单号 + */ + private String refundNum; + + /** + * 类型(10-退货 20-换货 30-维修 40-大家电安装 50-大家电移机 60-大家电增值服务 70-上门维修 90-优鲜赔 80-补发商品 100-试用收回 11-仅退款) + */ + private Integer refundType; + + /** + * 店铺id + */ + private Integer shopId; + + /** + * 店铺类型 + */ + private Integer shopType; + + /** + * 退款金额 + */ + private Double refundFee; + + /** + * 退款原因 + */ + private String refundReason; + + /** + * 原始订单号(来自于第三方平台) + */ + private String originalOrderId; + + /** + * 原始子订单号(来自于第三方平台) + */ + private String originalOrderItemId; + + /** + * 原始子订单skuId + */ + private String originalSkuId; + + /** + * erp商品id + */ + private Long erpGoodsId; + + /** + * erp sku id + */ + private Long erpGoodsSkuId; + + /** + * sku编码 + */ + private String specNum; + + /** + * 买家是否需要退货。可选值:1(是),0(否) + */ + private Integer hasGoodReturn; + + /** + * 商品名称 + */ + private String goodsName; + + /** + * 商品sku + */ + private String goodsSku; + + /** + * 商品图片 + */ + private String goodsImage; + + /** + * 退货数量 + */ + private Long quantity; + + /** + * 退货物流公司 + */ + private String returnLogisticsCompany; + + /** + * 退货物流单号 + */ + private String returnLogisticsCode; + + /** + * 收货时间 + */ + private Date receiveTime; + + /** + * 备注 + */ + private String remark; + + /** + * 发货人 + */ + private String contactPerson; + + /** + * 发货人手机号 + */ + private String mobile; + + /** + * 发货地址 + */ + private String address; + + /** + * 状态(10001待审核10002等待买家退货10005等待卖家收货14000拒绝退款10011退款关闭10010退款完成) + */ + private Integer status; + + /** + * 订单创建时间 + */ + private Date createTime; + + /** + * 创建人 + */ + private String createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新人 + */ + private String updateBy; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterRefundMapper.java b/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterRefundMapper.java new file mode 100644 index 00000000..f706f59e --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/mapper/ErpSaleAfterRefundMapper.java @@ -0,0 +1,18 @@ +package com.qihang.oms.mapper; + +import com.qihang.oms.domain.ErpSaleAfterRefund; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【erp_sale_after_refund(售后退款表)】的数据库操作Mapper +* @createDate 2024-06-19 17:59:48 +* @Entity com.qihang.oms.domain.ErpSaleAfterRefund +*/ +public interface ErpSaleAfterRefundMapper extends BaseMapper { + +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterRefundService.java b/oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterRefundService.java new file mode 100644 index 00000000..be020360 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/ErpSaleAfterRefundService.java @@ -0,0 +1,16 @@ +package com.qihang.oms.service; + +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.PageResult; +import com.qihang.oms.domain.ErpSaleAfterRefund; +import com.baomidou.mybatisplus.extension.service.IService; +import com.qihang.oms.domain.ErpSaleOrder; + +/** +* @author TW +* @description 针对表【erp_sale_after_refund(售后退款表)】的数据库操作Service +* @createDate 2024-06-19 17:59:48 +*/ +public interface ErpSaleAfterRefundService extends IService { + PageResult queryPageList(ErpSaleAfterRefund bo, PageQuery pageQuery); +} diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterRefundServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterRefundServiceImpl.java new file mode 100644 index 00000000..ca0591fe --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleAfterRefundServiceImpl.java @@ -0,0 +1,41 @@ +package com.qihang.oms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.common.common.PageQuery; +import com.qihang.common.common.PageResult; +import com.qihang.oms.domain.ErpSaleAfterRefund; +import com.qihang.oms.domain.ErpSaleOrder; +import com.qihang.oms.domain.ErpSaleOrderItem; +import com.qihang.oms.service.ErpSaleAfterRefundService; +import com.qihang.oms.mapper.ErpSaleAfterRefundMapper; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** +* @author TW +* @description 针对表【erp_sale_after_refund(售后退款表)】的数据库操作Service实现 +* @createDate 2024-06-19 17:59:48 +*/ +@AllArgsConstructor +@Service +public class ErpSaleAfterRefundServiceImpl extends ServiceImpl + implements ErpSaleAfterRefundService{ + private final ErpSaleAfterRefundMapper mapper; + @Override + public PageResult queryPageList(ErpSaleAfterRefund bo, PageQuery pageQuery) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(bo.getShopId()!=null,ErpSaleAfterRefund::getShopId,bo.getShopId()) + ; + Page pages = mapper.selectPage(pageQuery.build(), queryWrapper); + + + + return PageResult.build(pages); + } +} + + + + diff --git a/oms-api/src/main/resources/mapper/ErpSaleAfterRefundMapper.xml b/oms-api/src/main/resources/mapper/ErpSaleAfterRefundMapper.xml new file mode 100644 index 00000000..8e27dfc4 --- /dev/null +++ b/oms-api/src/main/resources/mapper/ErpSaleAfterRefundMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,refund_num,refund_type, + shop_id,shop_type,refund_fee, + refund_reason,original_order_id,original_order_item_id, + original_sku_id,erp_goods_id,erp_goods_sku_id, + spec_num,has_good_return,goods_name, + goods_sku,goods_image,quantity, + return_logistics_company,return_logistics_code,receive_time, + remark,contact_person,mobile, + address,status,create_time, + create_by,update_time,update_by + + diff --git a/vue/src/api/api/returned.js b/vue/src/api/api/returned.js deleted file mode 100644 index 93b380a8..00000000 --- a/vue/src/api/api/returned.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询退换货列表 -export function listReturned(query) { - return request({ - url: '/api/returned/list', - method: 'get', - params: query - }) -} - -// 查询退换货详细 -export function getReturned(id) { - return request({ - url: '/api/returned/' + id, - method: 'get' - }) -} - -// 新增退换货 -export function addReturned(data) { - return request({ - url: '/api/returned', - method: 'post', - data: data - }) -} - -// 修改退换货 -export function updateReturned(data) { - return request({ - url: '/api/returned', - method: 'put', - data: data - }) -} - -// 删除退换货 -export function delReturned(id) { - return request({ - url: '/api/returned/' + id, - method: 'delete' - }) -} diff --git a/vue/src/views/returned/index.vue b/vue/src/views/returned/index.vue deleted file mode 100644 index 8d8c8d0e..00000000 --- a/vue/src/views/returned/index.vue +++ /dev/null @@ -1,445 +0,0 @@ - - - diff --git a/vue/src/views/sale/refund/index.vue b/vue/src/views/sale/refund/index.vue index 11b10847..886d8120 100644 --- a/vue/src/views/sale/refund/index.vue +++ b/vue/src/views/sale/refund/index.vue @@ -272,7 +272,7 @@