zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
@@ -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/SysBusinessDataDao.xml
@@ -678,7 +678,7 @@ and company_id=#{companyId} </if> ) refundCardPay, (select IFNULL(sum(zk_price),0) from sys_order_item a (select IFNULL(sum(zk_price*count),0) from sys_order_item a inner join shopping_goods b on a.goods_id=b.id inner join sys_order c on a.ORDER_ID=c.id where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]> @@ -689,7 +689,7 @@ and c.company_id=#{companyId} </if> ) productAchieve, (select IFNULL(sum(zk_price),0) from sys_order_item a (select IFNULL(sum(zk_price*count),0) from sys_order_item a inner join shopping_goods b on a.goods_id=b.id inner join sys_order c on a.ORDER_ID=c.id where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]> @@ -847,7 +847,7 @@ and shop_id=#{shopId} </if> ) refundCardPay, (select IFNULL(sum(zk_price),0) from sys_order_item a (select IFNULL(sum(zk_price*count),0) from sys_order_item a inner join shopping_goods b on a.goods_id=b.id inner join sys_order c on a.ORDER_ID=c.id where b.good_type='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]> @@ -855,7 +855,7 @@ and c.shop_id=#{shopId} </if> ) productAchieve, (select IFNULL(sum(zk_price),0) from sys_order_item a (select IFNULL(sum(zk_price*count),0) from sys_order_item a inner join shopping_goods b on a.goods_id=b.id inner join sys_order c on a.ORDER_ID=c.id where b.good_type!='家居产品' and <![CDATA[ a.create_time > #{item.beginTime} and a.create_time < #{item.endTime}]]> 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
