parent: b687aa0f | patch | commit | ignore whitespace
wzy
2021-09-04 1a9b054b95eb864d1ae7d90d1dfbb497ca1db62a 
Merge branch 'score_shop' into api_score_meger
1 files modified
2 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 2 ●●●●● patch | view | raw | blame | history 
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java


@@ -1209,7 +1209,7 @@


     * 通过组合关系创建用户项目余次


     */


    private SysProjUse createProjuseByAssemble(SysOrder order, SysOrderItem sysOrderItem,


                                               ShoppingGoodsAssemble goodsAssemble, Long taocanId, Date failTime,String source,int maxCount) {


                                               ShoppingGoodsAssemble goodsAssemble, Long taocanId, Date failTime,String source,Integer maxCount) {


        //计算折扣


        Double zk = sysOrderItem.getZkPrice() / sysOrderItem.getPrice();