Merge remote-tracking branch 'origin/master'

rk

14 小时以前 086be7eae50e48ad554fd8a3f4cb1e333d587595

 server/dmmall_admin/src/main/java/com/doumee/api/business/GoodsorderController.java

@@ -12,6 +12,8 @@
import com.doumee.core.utils.kuaidi100.ExpressUtils;
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.GoodsorderExport;
import com.doumee.dao.web.request.AfterSaleApplyRequest;
import com.doumee.service.business.AftersaleService;
import com.doumee.service.business.GoodsorderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -36,6 +38,8 @@

    @Autowired
    private GoodsorderService goodsorderService;
    @Autowired
    private AftersaleService aftersaleService;

    @PreventRepeat
    @ApiOperation("新建")
@@ -95,6 +99,7 @@
    @PostMapping("/page")
    @RequiresPermissions("business:goodsorder:query")
    public ApiResponse<PageData<Goodsorder>> findPage (@RequestBody PageWrap<Goodsorder> pageWrap) {
        pageWrap.getModel().setNeedCount(true);
        return ApiResponse.success(goodsorderService.findPage(pageWrap));
    }

@@ -108,15 +113,9 @@
    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @RequiresPermissions("business:goodsorder:exportExcel")
    public void exportExcel (@RequestBody Goodsorder pageWrap, HttpServletResponse response) {
        List<Goodsorder> list=goodsorderService.exportExcel(pageWrap);
       for(Goodsorder model:list){
           if(model.getStatus()!=null){
               model.setStatusStr(Constants.OrderStatus.getInfo(model.getStatus()));
               model.setGoodsPrice(model.getGoodsPrice()+"  "+model.getGoodsNum());
           }
       }
        ExcelExporter.build(Goodsorder.class).export(list, "商品订单信息表", response);
    public void exportExcel (@RequestBody PageWrap<Goodsorder> pageWrap, HttpServletResponse response) {
        List<GoodsorderExport> list=goodsorderService.exportExcel(pageWrap);
        ExcelExporter.build(GoodsorderExport.class).export(list, "商品订单信息表", response);
    }

    @ApiOperation("根据ID查询")
@@ -145,8 +144,8 @@
    @ApiOperation("订单退款")
    @PostMapping("/orderRefund")
    @RequiresPermissions("business:goodsorder:update")
    public ApiResponse orderRefund(@RequestBody Goodsorder goodsorder) {
        goodsorderService.orderRefund(goodsorder);
    public ApiResponse orderRefund(@RequestBody AfterSaleApplyRequest goodsorder) {
        aftersaleService.afterSaleApply(goodsorder);
        return ApiResponse.success(null);
    }