zq-erp/pom.xml
@@ -390,11 +390,11 @@ <exclude>config/test/*</exclude> <exclude>config/xcx/*</exclude> <!-- <!----> <exclude>config/config.json</exclude> <exclude>config/application.properties</exclude> <exclude>config/system.properties</exclude> -->
@@ -21,4 +21,6 @@ Integer selectTotal(@Param("record")OrderFlowListDto orderFlowListDto); Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime); Integer deleteByOrderId(@Param("orderId") Long orderId); } zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -154,7 +154,7 @@ @Override public void addAchieveByServiceOrder(SysProjServices projServices) { public void addAchieveByServiceOrder(SysProjServices projServices) { List<AchieveNew> achieveNewList = new ArrayList<>(); List<SysBeauticianState> beauticianStateList = sysBeauticianStateDao.selectBySerIds(projServices.getId()); int size = beauticianStateList.size(); @@ -172,9 +172,9 @@ achieveNew.setVipId(projServices.getVipId()); // 是否为赠送业绩 if (Dictionary.TAOCAN_SOURCE_ZS.equals(projUse.getSource())) { achieveNew.setFreeConsume(projUse.getPrice()); achieveNew.setFreeConsume(projUse.getPrice()*beauticianState.getCount()); } else { achieveNew.setHisConsume(projUse.getPrice()); achieveNew.setHisConsume(projUse.getPrice()*beauticianState.getCount()); } achieveNew.setT2(projUse.getSource()); achieveNew.setDatatime(new Date()); zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -365,6 +365,10 @@ AchieveNew achieveNew = new AchieveNew(); achieveNew.setOrderId(id); achieveNewService.removeByModel(achieveNew); // 删除收款记录 sysOrderFlowDao.deleteByOrderId(id); // 取消订单 order.setStatu(Dictionary.ORDER_STATU_YQX); @@ -1129,7 +1133,7 @@ puse.setVipId(order.getVipId()); puse.setStatus(Dictionary.TAOCAN_STATUS_YX); puse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM); puse.setBalance(MoneyUtil.add(sysOrderItem.getCardPay(), sysOrderItem.getCashPay())); puse.setBalance(sysOrderItem.getZkPrice()); puse.setPrice(sysOrderItem.getZkPrice()); puse.setProjName(sysOrderItem.getShoppingGoods().getName()); // 赠送和打折后金额为0的都视为赠送项目 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -65,6 +65,9 @@ create_time=#{payTime} where order_id=#{orderId} </update> <delete id="deleteByOrderId"> delete from sys_order_flow where order_id=#{orderId} </delete> <select id="selectByOrderId" resultMap="SysOrderFlowMap"> select a.*, b.order_no from sys_order_flow a
