fix:退款订单退业绩是订单状态的判断

Helius

2022-09-19 f2b9a83f75a4345cd42d008f3153c18f8f890cad

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

@@ -16,6 +16,7 @@
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysUsersDao;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.enums.BooleanEnum;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
@@ -358,7 +359,7 @@

    private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
        BusParameterSettings shopManageJjcpasConsume = null;
        if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
        if (SysOrder.ORDER_TYPE_REFUND == pageOrder.getOrderType()) {
            achieveNew.setId(null);
            achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
            achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());
@@ -380,7 +381,10 @@
            if (shopManageJjcpasConsume == null) {
                shopManageJjcpasConsume = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_JJCPAS_CONSUME, pageOrder.getCompanyId());
            }
            if (AppConstance.IS_Y.equals(shopManageJjcpasConsume.getParamValue())) {
//            if (AppConstance.IS_Y.equals(shopManageJjcpasConsume.getParamValue())) {
//                achieveNew.setHisConsume(achieveNew.getGoodsCash());
//            }
            if (BooleanEnum.TRUE.getValue() == shopManageJjcpasConsume.getIntParamValue()) {
                achieveNew.setHisConsume(achieveNew.getGoodsCash());
            }