Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-10-06 1d394446abb8465e63fd1fd9a768796e149edbd6

 zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java

@@ -12,8 +12,12 @@
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
@@ -93,6 +97,9 @@

    @Autowired
    RabiitMqTemplate rabiitMqTemplate;

    @Autowired
    private BusParameterSettingsDao busParameterSettingsDao;

    @Autowired
    private SysProjServicesDao sysProjServicesDao;
@@ -190,7 +197,6 @@
    }



    /**
     * 列表显示
     */
@@ -204,7 +210,9 @@
        if (StringUtils.isBlank(pageVo.getOrder())) {
            pageVo.setOrder("desc");
        }
        if (!DataAuthUtil.hasAllShopAuth()) {
        sysOrder.setShopId(getMe().getShopId());
        }
        return new AjaxResult(AjaxResult.STATUS_SUCCESS, orderService.findInPage(sysOrder, pageVo),
                orderService.findTotal(sysOrder));
    }
@@ -295,7 +303,6 @@

        //查询会有所有有效的会员卡
        result.putInMap("totalMoney", moneyCardUseDao.selectVipCardTotalMoney(order.getVipId()));



        return result;
@@ -441,14 +448,14 @@
    }
//=======================================页面转发END==================================


    /**
     * 2021-08-20 新增：erp系统取消订单接口，不做订单状态校验
     * 取消订单
     */
    @Transactional(rollbackFor = Exception.class)
    @RequestMapping(value = "/cancelOrder")
    @RequestMapping(value = "/erpCancelOrder")
    public @ResponseBody
    AjaxResult cancelOrder(Long id, Integer del) {
    AjaxResult erpCancelOrder(Long id) {

        AjaxResult result = new AjaxResult();
        SysOrder order = orderService.findById(id);
@@ -465,15 +472,32 @@
        }

        orderService.cancelOrder(id);
//        if (del > 0) {
//            orderService.removeById(id);
//            result.setInfo("删除成功！");
//        } else {

            result.setInfo("取消成功！");
//        }

        result.setStatus(AjaxResult.STATUS_SUCCESS);

        return result;
    }


    /**
     * 取消订单
     */
    @Transactional(rollbackFor = Exception.class)
    @RequestMapping(value = "/cancelOrder")
    public @ResponseBody
    AjaxResult cancelOrder(Long id, Integer del) {

        SysOrder order = orderService.findById(id);
        BusParameterSettings shopManageAbleCancelDfkOrder = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER, order.getCompanyId());
        if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
                && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
            if (!Dictionary.ORDER_STATU_DFK.equals(order.getStatu())) {
                return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待付款订单");
            }
        }
        return erpCancelOrder(id);
    }

    @RequestMapping(value = "/exportExcel")
@@ -498,10 +522,9 @@
    }




    /**
     * 执行订单导出，总部和门店共用，但是搜索条件不一样
     *
     * @param response
     * @param sysOrder
     * @throws IOException