20210422 签到

xiaoyong931011

2021-04-22 710b32a988b8c1881c815595a3d390cd1106c560

 zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpOrderController.java

@@ -18,7 +18,7 @@
import com.matrix.system.hive.bean.SysOrderItem;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.service.AchieveNewService;
import com.matrix.system.hive.service.MoneyCardUseService;
import com.matrix.system.hive.service.SysOrderItemService;
@@ -109,6 +109,8 @@
        moneyCardUse.setVipId(order.getVipId());
        List<MoneyCardUse> cards = cardUseService.findByModel(moneyCardUse);

        WebUtil.getRequest().setAttribute("orderParam", id);

        WebUtil.getRequest().setAttribute("cards", cards);
        return "admin/hive-erp/order/orderXq-form";
    }
@@ -153,7 +155,7 @@
                temp.add(item.getOrderNo());
                temp.add(item.getVipName());
                temp.add(item.getVipPhone());
                temp.add(DateUtils.dateToString(item.getOrderTime(), DateUtils.DATE_FORMAT_MM));
                temp.add(DateUtil.dateToString(item.getOrderTime(), DateUtil.DATE_FORMAT_MM));
                temp.add(item.getTotal());
                temp.add(item.getZkTotal());
                temp.add(item.getCashPay());