beauty-erp.git - Gitblit

			@@ -359,7 +359,7 @@

			private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
			BusParameterSettings shopManageJjcpasConsume =null;
			if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
			if (SysOrder.ORDER_TYPE_REFUND == pageOrder.getOrderType()) {
			achieveNew.setId(null);
			achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
			achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());

			@@ -440,9 +440,6 @@
			<if test="shopId != null and shopId !='' ">
			SHOP_ID = #{shopId},
			</if>
			<if test="isDelete != null and isDelete !='' ">
			IS_DELETE = #{isDelete},
			</if>
			<if test="passWord != null and passWord !='' ">
			PASSWORD = #{passWord},
			</if>
			@@ -863,9 +860,6 @@
			<if test="record.shopId != null and record.shopId !='' ">
			and a.SHOP_ID = #{record.shopId}
			</if>
			<if test="record.isDelete != null and record.isDelete !='' ">
			and a.IS_DELETE = #{record.isDelete}
			</if>
			<if test="record.passWord != null and record.passWord !='' ">
			and a.PASSWORD = #{record.passWord}
			</if>
			@@ -932,7 +926,7 @@


			<sql id="where1">
			where 1=1
			where a.IS_DELETE = 'N'
			<if test="record!=null">
			<if test="record.id != null and record.id !='' ">
			and a.ID = #{record.id}
			@@ -994,9 +988,6 @@
			</if>
			<if test="record.shopId != null and record.shopId !='' ">
			and a.SHOP_ID = #{record.shopId}
			</if>
			<if test="record.isDelete != null and record.isDelete !='' ">
			and a.IS_DELETE = #{record.isDelete}
			</if>
			<if test="record.passWord != null and record.passWord !='' ">
			and a.PASSWORD = #{record.passWord}

	zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java	2 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml	11 ●●●●● patch \| view \| raw \| blame \| history