modify

Helius

2020-12-23 8a99ea72de8c40d0c9871a0d6559920fcc929a54

modify

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java

@@ -143,15 +143,14 @@
    /**
     * 业绩计算
     */
    private List<AchieveNew> achaeveList;
    private List<AchieveNew> achieveList;


    public List<AchieveNew> getAchaeveList() {
        return achaeveList;
    public List<AchieveNew> getAchieveList() {
        return achieveList;
    }

    public void setAchaeveList(List<AchieveNew> achaeveList) {
        this.achaeveList = achaeveList;
    public void setAchieveList(List<AchieveNew> achieveList) {
        this.achieveList = achieveList;
    }

    public String getPayMethodDetail() {

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java

@@ -214,9 +214,9 @@
        if (CollectionUtils.isNotEmpty(pageOrder.getItems())) {
            for (SysOrderItem orderItem : pageOrder.getItems()) {

                if (orderItem != null && CollectionUtils.isNotEmpty(orderItem.getAchaeveList())) {
                if (orderItem != null && CollectionUtils.isNotEmpty(orderItem.getAchieveList())) {

                    for (AchieveNew achieveNew : orderItem.getAchaeveList()) {
                    for (AchieveNew achieveNew : orderItem.getAchieveList()) {
                        if (achieveNew !=null   && achieveNew.getT1()!=null) {
                            buildAchieve(pageOrder,  orderItem, achieveNew);
                            // 新增美疗师业绩

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -1183,7 +1183,7 @@
        orderItem.setIsFree(Dictionary.FLAG_NO);
        orderItem.setPrice(czVo.getBjmoney());
        orderItem.setStatus(Dictionary.ORDER_STATU_YFK);
        orderItem.setAchaeveList(czVo.getAchaeveList());
        orderItem.setAchieveList(czVo.getAchaeveList());
        orderItemDao.insert(orderItem);