caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 补充提交部分退款售后逻辑

Browse Source
This commit is contained in:
lele0521 2024-01-16 16:45:27 +08:00
parent 4c47d4aba2
commit 9c24adf77d
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/order/aftersale/serviceimpl/AfterSaleServiceImpl.java
View File

@ -215,7 +215,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
afterSaleStatusEnum = AfterSaleStatusEnum.WAIT_REFUND; afterSaleStatusEnum = AfterSaleStatusEnum.WAIT_REFUND;
} }
} else { } else {
afterSaleStatusEnum = AfterSaleStatusEnum.PASS; afterSaleStatusEnum = AfterSaleStatusEnum.COMPLETE;
} }
} else { } else {
afterSaleStatusEnum = AfterSaleStatusEnum.REFUSE; afterSaleStatusEnum = AfterSaleStatusEnum.REFUSE;

8
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java
View File

@ -56,6 +56,14 @@ public class OrderItemVO {
@ApiModelProperty(value = "评论状态:未评论(UNFINISHED),待追评(WAIT_CHASE),评论完成(FINISHED)，") @ApiModelProperty(value = "评论状态:未评论(UNFINISHED),待追评(WAIT_CHASE),评论完成(FINISHED)，")
private String commentStatus; private String commentStatus;
/**
* @see cn.lili.modules.order.order.entity.enums.RefundStatusEnum
*/
@ApiModelProperty(value = "退款状态")
private String isRefund;
@ApiModelProperty(value = "退款金额")
private String refundPrice;
public void setSn(String sn) { public void setSn(String sn) {
this.sn = sn; this.sn = sn;

12
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java
View File

@ -142,6 +142,12 @@ public class OrderSimpleVO {
@ApiModelProperty(value = "订单促销类型") @ApiModelProperty(value = "订单促销类型")
private String orderPromotionType; private String orderPromotionType;
@ApiModelProperty(value = "是否退款")
private String groupIsRefund;
@ApiModelProperty(value = "退款金额")
private String groupRefundPrice;
public List<OrderItemVO> getOrderItems() { public List<OrderItemVO> getOrderItems() {
if (CharSequenceUtil.isEmpty(groupGoodsId)) { if (CharSequenceUtil.isEmpty(groupGoodsId)) {
return new ArrayList<>(); return new ArrayList<>();
@ -188,6 +194,12 @@ public class OrderSimpleVO {
if (CharSequenceUtil.isNotEmpty(groupGoodsPrice) && groupGoodsPrice.split(",").length == groupGoodsId.split(",").length) { if (CharSequenceUtil.isNotEmpty(groupGoodsPrice) && groupGoodsPrice.split(",").length == groupGoodsId.split(",").length) {
orderItemVO.setGoodsPrice(Double.parseDouble(groupGoodsPrice.split(",")[i])); orderItemVO.setGoodsPrice(Double.parseDouble(groupGoodsPrice.split(",")[i]));
} }
if (CharSequenceUtil.isNotEmpty(groupIsRefund) && groupIsRefund.split(",").length == groupGoodsId.split(",").length) {
orderItemVO.setIsRefund(groupIsRefund.split(",")[i]);
}
if (CharSequenceUtil.isNotEmpty(groupRefundPrice) && groupRefundPrice.split(",").length == groupGoodsId.split(",").length) {
orderItemVO.setRefundPrice(groupRefundPrice.split(",")[i]);
}
return orderItemVO; return orderItemVO;
} }

2
framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java
View File

@ -71,6 +71,8 @@ public interface OrderMapper extends BaseMapper<Order> {
",GROUP_CONCAT(oi.comment_status) as group_comment_status" + ",GROUP_CONCAT(oi.comment_status) as group_comment_status" +
",GROUP_CONCAT(oi.sn) as group_order_items_sn " + ",GROUP_CONCAT(oi.sn) as group_order_items_sn " +
",GROUP_CONCAT(oi.goods_price) as group_goods_price " + ",GROUP_CONCAT(oi.goods_price) as group_goods_price " +
",GROUP_CONCAT(oi.is_refund) as group_is_refund " +
",GROUP_CONCAT(oi.refund_price) as group_refund_price " +
" FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ") " FROM li_order o LEFT JOIN li_order_item AS oi on o.sn = oi.order_sn ${ew.customSqlSegment} ")
IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper); IPage<OrderSimpleVO> queryByParams(IPage<OrderSimpleVO> page, @Param(Constants.WRAPPER) Wrapper<OrderSimpleVO> queryWrapper);