Commit cf71e35a by Carwyn

1. 删除买赠券配置引起的空 promotion 转换规则

parent dc0302e1
...@@ -206,16 +206,6 @@ ...@@ -206,16 +206,6 @@
<offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/> <offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/>
<channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="ebName"/> <channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="ebName"/>
</promotion> </promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="orderInfo/voucherType" okey="orderInfo/discountOrderProducts">
<!-- buyOrPromote: 0 买的商品; 1 活动商品 -->
<type type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">5</type>
<id type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/activeCode"/>
<desc type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/activeName"/>
<seq type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/lineNumber"/>
<pid type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/productNumber"/>
<offer type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">0</offer>
<channel type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="ebName"/>
</promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-3)" okey="orderInfo/discountOrderProducts">^M <promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-3)" okey="orderInfo/discountOrderProducts">^M
<!-- buyOrPromote: 0 买的商品; 1 活动商品 --> <!-- buyOrPromote: 0 买的商品; 1 活动商品 -->
<type type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="orderInfo/discountOrderProducts/buyOrPromote">5</type> <type type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="orderInfo/discountOrderProducts/buyOrPromote">5</type>
...@@ -304,16 +294,6 @@ ...@@ -304,16 +294,6 @@
<offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/> <offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/>
<channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="ebName"/> <channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="ebName"/>
</promotion> </promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="orderInfo/voucherType" okey="orderInfo/discountOrderProducts">
<!-- buyOrPromote: 0 买的商品; 1 活动商品 -->
<type type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">5</type>
<id type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/activeCode"/>
<desc type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/activeName"/>
<seq type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/lineNumber"/>
<pid type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/productNumber"/>
<offer type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">0</offer>
<channel type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="ebName"/>
</promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-3)" okey="orderInfo/discountOrderProducts">^M <promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-3)" okey="orderInfo/discountOrderProducts">^M
<!-- buyOrPromote: 0 买的商品; 1 活动商品 --> <!-- buyOrPromote: 0 买的商品; 1 活动商品 -->
<type type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="orderInfo/discountOrderProducts/buyOrPromote">5</type> <type type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="orderInfo/discountOrderProducts/buyOrPromote">5</type>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment