blame | history | patch | commit | commitdiff | ignore whitespace
935090232@qq.com
2021-10-06 1d394446abb8465e63fd1fd9a768796e149edbd6 
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java


@@ -1026,8 +1026,8 @@


        }




        sourceOrder.setArrears(sourceOrder.getArrears() - refundTotal);


        sourceOrder.setCardPay(sourceOrder.getCardPay() + cardPayTotal);


        sourceOrder.setCashPay(sourceOrder.getCashPay() + cashPayTotal);


        sourceOrder.setCardPay(sourceOrder.getCardPay()==null?0:sourceOrder.getCardPay() + cardPayTotal);


        sourceOrder.setCashPay(sourceOrder.getCashPay()==null?0:sourceOrder.getCashPay() + cashPayTotal);


        sysOrderDao.update(sourceOrder);


    }




@@ -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();