xzx.git - Gitblit

			@@ -271,8 +271,8 @@
			if (StrUtil.isNotBlank(addressInfo.getTagName())) {
			address.append(StrUtil.isNotBlank(addressInfo.getHouseName()) ? addressInfo.getHouseName() : "");
			if (Constants.ADDRESS_TYPE_HOME.equals(addressInfo.getTagName())) {
			address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
			address.append(StrUtil.isNotBlank(addressInfo.getUnitName()) ? addressInfo.getUnitName() : "");
			address.append(StrUtil.isNotBlank(addressInfo.getHouseNumber()) ? addressInfo.getHouseNumber() : "");
			}
			}
			expressInfo.setAddress(address.toString());

			@@ -45,10 +45,10 @@
			a.is_sale
			</if>
			<if test="namePx != null and namePx != '' and namePx == 4">
			a.present_price
			a.present_price + 0
			</if>
			<if test="namePx != null and namePx != '' and namePx == 5">
			a.original_price
			a.original_price + 0
			</if>
			<if test="namePx != null and namePx != '' and namePx == 6">
			stock

			@@ -188,6 +188,7 @@
			stringBuffer.append(pointReward);
			redPaperRule.setStatus((short) 0);
			redPaperRule.setRuleName("分销规则");
			redPaperRule.setRuleType("9");
			redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,point_reward");
			redPaperRule.setShareRatio(stringBuffer.toString());
			redPaperRuleMapper.insert(redPaperRule);

	gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java	2 ●●●●● patch \| view \| raw \| blame \| history
	gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml	4 ●●●●● patch \| view \| raw \| blame \| history
	gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java	1 ●●●●● patch \| view \| raw \| blame \| history