20220822

xiaoyong931011

2022-08-29 eab74d698bb5c840146cc7bd54be2462f3ca4074

20220822

 src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java

@@ -62,6 +62,21 @@
    private final MallMemberMapper mallMemberMapper;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;



    /**
     * 订单多次退款审核
     *
     * @param mallRefundEntity
     * @param request
     * @return
     */
    @GetMapping("orderRefundList")
    public FebsResponse orderRefundList(MallRefundEntity mallRefundEntity, QueryRequest request) {
        Map<String, Object> data = getDataTable(adminMallOrderService.getOrderRefundListInPage(mallRefundEntity, request));
        return new FebsResponse().success().data(data);
    }

    /**
     * 订单列表
     *

 src/main/java/cc/mrbird/febs/mall/controller/ViewMallOrderController.java

@@ -32,6 +32,16 @@
     * 订单列表
     * @return
     */
    @GetMapping("orderRefundList")
    @RequiresPermissions("orderRefundList:view")
    public String orderRefundList() {
        return FebsUtil.view("modules/order/orderRefundList");
    }

    /**
     * 订单列表
     * @return
     */
    @GetMapping("orderList")
    @RequiresPermissions("orderList:view")
    public String orderList() {

 src/main/java/cc/mrbird/febs/mall/mapper/MallRefundMapper.java

@@ -2,6 +2,8 @@

import cc.mrbird.febs.mall.entity.MallRefundEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;

import java.util.List;
@@ -10,4 +12,5 @@

    List<MallRefundEntity> selectByItemIdAndOrderIdAndState(@Param("itemId")Long itemId, @Param("orderId")Long orderId, @Param("state")int i);

    IPage<MallRefundEntity> getOrderRefundListInPage(Page<MallRefundEntity> page, @Param("record")MallRefundEntity mallRefundEntity);
}

 src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java

@@ -5,6 +5,7 @@
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
import cc.mrbird.febs.mall.entity.MallRefundEntity;
import cc.mrbird.febs.mall.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -68,4 +69,6 @@
    FebsResponse showStateSwitchOff(Long id);

    void updateOrderStateAndDeliveryState(Long id, int value, int value1);

    IPage<MallRefundEntity> getOrderRefundListInPage(MallRefundEntity mallRefundEntity, QueryRequest request);
}

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java

@@ -54,6 +54,7 @@

    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final IMallMoneyFlowService mallMoneyFlowService;
    private final MallRefundMapper mallRefundMapper;


    @Override
@@ -405,6 +406,13 @@
    }

    @Override
    public IPage<MallRefundEntity> getOrderRefundListInPage(MallRefundEntity mallRefundEntity, QueryRequest request) {
        Page<MallRefundEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<MallRefundEntity> mallRefundEntityIPage = mallRefundMapper.getOrderRefundListInPage(page, mallRefundEntity);
        return mallRefundEntityIPage;
    }

    @Override
    public void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto) {
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectByOrderNo(deliverGoodsDto.getOrderNo());
        if (mallOrderInfo == null) {

 src/main/java/cc/mrbird/febs/mall/vo/OrderItemVo.java

@@ -15,6 +15,9 @@
@ApiModel(value = "OrderListItemVo", description = "订单列表明细返回参数类")
public class OrderItemVo {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "skuId")
    private Long skuId;


 src/main/resources/mapper/modules/MallRefundMapper.xml

@@ -20,5 +20,17 @@

    </select>

    <select id="getOrderRefundListInPage" resultType="cc.mrbird.febs.mall.entity.MallRefundEntity">
        select a.* from mall_refund a
        <where>
            <if test="record != null" >
                <if test="record.state!=null and record.state!=''">
                    and a.state = #{record.state}
                </if>
            </if>
        </where>
        order by a.CREATED_TIME desc
    </select>


</mapper>