modify

Helius

2021-01-12 15e19113558e46aaf8f7263a66730fc01aadf603

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

@@ -15,10 +15,7 @@
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.bean.MoneyCardUse;
import com.matrix.system.hive.bean.SysOrder;
import com.matrix.system.hive.bean.SysOrderItem;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
@@ -26,10 +23,7 @@
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.AchieveNewService;
import com.matrix.system.hive.service.MoneyCardUseService;
import com.matrix.system.hive.service.SysOrderItemService;
import com.matrix.system.hive.service.SysOrderService;
import com.matrix.system.hive.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
@@ -82,6 +76,12 @@

    @Autowired
    SysShopInfoDao shopInfoDao;

    @Autowired
    private SysVipInfoService sysVipInfoService;

    @Autowired
    private SysOrderFlowService sysOrderFlowService;


    /**
@@ -175,6 +175,9 @@
        }
        //设置过滤后的购物车条目
        car.setCarItems(carItems);

        SysVipInfo info = (SysVipInfo) WebUtil.getSession().getAttribute(SystemConstance.CURRENT_CUSTOMER);
        car.setVipId(info.getId());

        // 添加新订单
        int i = orderService.createOrder(WebUtil.getSession(), car);
@@ -362,30 +365,38 @@
    public String orderItem(SysOrder orderVo) {
        // 根据id查到对应的订单信息
        SysOrder order=null;
       if(orderVo.getId()!=null){
           order   = orderService.findById(orderVo.getId());
       }else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
        if(orderVo.getId()!=null){
           order  = orderService.findById(orderVo.getId());
        }else if(StringUtils.isNotBlank(orderVo.getOrderNo())){
           List<SysOrder> byModel = orderService.findByModel(orderVo);
           if(byModel.size()==1){
               order=orderService.findById(byModel.get(0).getId());
           }
       }
        }
        List<SysOrderItem> sysOrderItems = orderItemDao.selectByOrderId(order.getId());
        order.setItems(sysOrderItems);

        WebUtil.getRequest().setAttribute("order", order);
        SysVipInfo vipInfo = sysVipInfoService.findById(order.getVipId());
        // 根据会员Id查到会员有效的会员卡
        // 根据订单号查找订单条目
        SysOrderItem orderItem = new SysOrderItem();
        orderItem.setOrderId(order.getId());
        List<SysOrderItem> orderItems = orderItemService.findByModel(orderItem);
        WebUtil.getRequest().setAttribute("orderItems", orderItems);
        List<SysOrderItem> orderItems = orderItemService.findByOrderId(order.getId());

        MoneyCardUse moneyCardUse = new MoneyCardUse();
        moneyCardUse.setVipId(order.getVipId());
        List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);

        List<SysOrderFlow> flows = sysOrderFlowService.findByOrderId(order.getId());
        order.setFlows(flows);

        List<SysOrderFlow> payMethods = sysOrderFlowService.findPayMethodsAmount(order.getId());

        List<AchieveNew> achieveList = achieveNewService.findOrderItemAchieve(order.getId());
        WebUtil.getRequest().setAttribute("orderItems", orderItems);
        WebUtil.getRequest().setAttribute("order", order);
        WebUtil.getRequest().setAttribute("cards", cards);
        WebUtil.getRequest().setAttribute("vipInfo", vipInfo);
        WebUtil.getRequest().setAttribute("payMethods", payMethods);
        WebUtil.getRequest().setAttribute("achieveList", achieveList);
        return "admin/hive/beautySalon/orderXq-form";
    }