modify

Helius

2021-04-19 840d78d6ff875d36e6a602772ea9b49b0732ae63

modify

 zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java

@@ -491,6 +491,11 @@
            shoppingGood.setIsDel(1);
            shoppingGood.setZjm(StringUtils.toHanyuPinyin(shoppingGood.getName()) + "," + StringUtils.toHeadWordHanyuPinyin(shoppingGood.getName()));

            if (shoppingGood.getCarUseCount() != null) {
                shoppingGood.setIsCourse("Y");
                shoppingGood.setIsInfinite("N");
            }

            shoppingGood.setWeiDescription("数据迁移-tc");

            List<ShoppingGoodsAssemble> assembleList = mapsToListBean(assembles, ShoppingGoodsAssemble.class);
@@ -1074,7 +1079,7 @@
                                                                            "\t\ta.balance,\n" +
                                                                            "\t\ta.remark,\n" +
                                                                            "        b.name projName,\n" +
                                                                            "        sum(a.SURPLUS_COUNT) SURPLUS_COUNT\n" +
                                                                            "        a.SURPLUS_COUNT\n" +
                                                                            "\t\tfrom sys_proj_use a\n" +
                                                                            "\t\tleft join shopping_goods b on a.TAOCAN_ID= b.ID\n" +
                                                                            "where TAOCAN_ID IS NOT NULL\n" +
@@ -1507,4 +1512,35 @@
        }
    }


    @Transactional(rollbackFor = Exception.class)
    public void tyOrderAndAchieveMove() {
        jdbcTemplate.update("update sys_order set order_type=1, is_has_refund=2 where 1=1");

        List<SysOrderFlow> flows = sysOrderFlowDao.selectOrderFlowByType();
        if (CollUtil.isNotEmpty(flows)) {
            for (SysOrderFlow flow : flows) {
                SysOrder sysOrder = sysOrderDao.selectById(flow.getOrderId());
                sysOrder.setIsHasRefund(1);
                sysOrderDao.update(sysOrder);
            }
        }

        List<AchieveNew> achieveNews = achieveNewDao.selectAchieveForOrder();
        if (CollUtil.isNotEmpty(achieveNews)) {
            for (AchieveNew achieveNew : achieveNews) {
                if ("现金业绩".equalsIgnoreCase(achieveNew.getAchieveType())) {
                    achieveNew.setPayMethod("现金");
                } else {
                    achieveNew.setPayMethod("划扣");
                }
                achieveNew.setAchieveType("顾问业绩");
                achieveNew.setGoodsCash(Double.parseDouble(achieveNew.getT1()));
                achieveNewDao.updateByModel(achieveNew);
            }

        }

    }

}

 zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java

@@ -77,4 +77,6 @@
    int deleteByOrderId(@Param("orderId") Long orderId);

    List<AchieveNew> selectAchieveByServiceOrderId(@Param("serviceOrderId") Long serviceOrderId);

    List<AchieveNew> selectAchieveForOrder();
}

 zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java

@@ -23,4 +23,6 @@
    Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);

    Integer deleteByOrderId(@Param("orderId") Long orderId);

    List<SysOrderFlow> selectOrderFlowByType();
}

 zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml

@@ -1070,4 +1070,8 @@
    <select id="selectAchieveByServiceOrderId" resultMap="AchieveNewMap">
        select * from achieve_new where service_order_id=#{serviceOrderId}
    </select>

    <select id="selectAchieveForOrder" resultMap="AchieveNewMap">
        select * from achieve_new where order_type='订单'
    </select>
</mapper>

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml

@@ -187,4 +187,8 @@
        </where>
    </select>

    <select id="selectOrderFlowByType" resultMap="SysOrderFlowMap">
        select * from sys_order_flow where flow_type='退款'
    </select>

</mapper>

 zq-erp/src/test/java/com/matrix/DataMoveTest.java

@@ -142,8 +142,13 @@
        dataMove.serviceOrderNew(dataMove.serviceOrderOld());
    }


    @Test
    public void moneyCardUseMoveTest() {
        dataMove.moneyCardUseNew(dataMove.moneyCardUseOld());
    }


    public void tyOrderAndAchieveDataTest() {

    }
}