beauty-erp.git - Gitblit

			@@ -7,7 +7,7 @@
			#spring.datasource.url=jdbc:mysql://119.3.52.84:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
			spring.datasource.username=chuhuan
			spring.datasource.password=chuhuan
			spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
			spring.datasource.url=jdbc:mysql://121.37.162.173:3306/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8

			@@ -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/config/prd/application.properties	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml	8 ●●●●● patch \| view \| raw \| blame \| history