Skip to content

F
fmcoupon-linux
Commit 924b3ede by Carwyn
Options

1. 渠道名称字段变更为 ebName

parent 717a5524
Showing with 8 additions and 8 deletions
Config/CoCo/Client.xml
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
<seq type="string" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="orderInfo/discountOrderProducts/lineNumber"/> <seq type="string" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="orderInfo/discountOrderProducts/lineNumber"/>
<pid type="string" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="orderInfo/discountOrderProducts/productNumber"/> <pid type="string" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="orderInfo/discountOrderProducts/productNumber"/>
<offer type="int" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="orderInfo/discountOrderProducts/platformDiscountPrice"/> <offer type="int" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="orderInfo/discountOrderProducts/platformDiscountPrice"/>
<channel type="string" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="partnerName"/> <channel type="string" notzero="orderInfo/discountOrderProducts/platformDiscountPrice" okey="ebName"/>
</promotion> </promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="orderInfo/voucherType" okey="orderInfo/discountOrderProducts"> <promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="orderInfo/voucherType" okey="orderInfo/discountOrderProducts">
<type type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice">4</type> <type type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice">4</type>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
<seq type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/lineNumber"/> <seq type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/lineNumber"/>
<pid type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/productNumber"/> <pid type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/productNumber"/>
<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="partnerName"/> <channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="ebName"/>
</promotion> </promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="orderInfo/voucherType" okey="orderInfo/discountOrderProducts"> <promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="orderInfo/voucherType" okey="orderInfo/discountOrderProducts">
<!-- buyOrPromote： 0 买的商品; 1 活动商品 --> <!-- buyOrPromote： 0 买的商品; 1 活动商品 -->
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
<seq type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/lineNumber"/> <seq type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/lineNumber"/>
<pid type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/productNumber"/> <pid type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/productNumber"/>
<offer type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">0</offer> <offer type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">0</offer>
<channel type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="partnerName"/> <channel type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="ebName"/>
</promotion> </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 活动商品 -->
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
<seq type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/lineNumber"/>^M <seq type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/lineNumber"/>^M
<pid type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/productNumber"/>^M <pid type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/productNumber"/>^M
<offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/>^M <offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/>^M
<channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="partnerName"/>^M <channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" okey="ebName"/>^M
</promotion> </promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-3)" okey="orderInfo/discountOrderProducts"> <promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-3)" okey="orderInfo/discountOrderProducts">
<!-- buyOrPromote： 0 买的商品; 1 活动商品 --> <!-- buyOrPromote： 0 买的商品; 1 活动商品 -->
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<seq type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/lineNumber"/> <seq type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/lineNumber"/>
<pid type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/productNumber"/> <pid type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="orderInfo/discountOrderProducts/productNumber"/>
<offer type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">0</offer> <offer type="int" iszero="orderInfo/discountOrderProducts/buyOrPromote">0</offer>
<channel type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="partnerName"/> <channel type="string" iszero="orderInfo/discountOrderProducts/buyOrPromote" okey="ebName"/>
</promotion> </promotion>
<!-- 1 代金券: 平台优惠入账，商户优惠入折扣 --> <!-- 1 代金券: 平台优惠入账，商户优惠入折扣 -->
<promotion type="array" notzero="orderInfo/totalPlatformDiscount" iszero="(%orderInfo/voucherType%-1)"> <promotion type="array" notzero="orderInfo/totalPlatformDiscount" iszero="(%orderInfo/voucherType%-1)">
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
<id type="string" notzero="orderInfo/totalPlatformDiscount" okey="orderInfo/activeCode"/> <id type="string" notzero="orderInfo/totalPlatformDiscount" okey="orderInfo/activeCode"/>
<desc type="string" notzero="orderInfo/totalPlatformDiscount" okey="orderInfo/activeName"/> <desc type="string" notzero="orderInfo/totalPlatformDiscount" okey="orderInfo/activeName"/>
<offer type="int" notzero="orderInfo/totalPlatformDiscount" okey="orderInfo/totalPlatformDiscount"/> <offer type="int" notzero="orderInfo/totalPlatformDiscount" okey="orderInfo/totalPlatformDiscount"/>
<channel type="string" notzero="orderInfo/totalPlatformDiscount" okey="partnerName"/> <channel type="string" notzero="orderInfo/totalPlatformDiscount" okey="ebName"/>
</object> </object>
</promotion> </promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-1)"> <promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-1)">
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
<id type="string" notzero="orderInfo/totalMerchantDiscount" okey="orderInfo/activeCode"/> <id type="string" notzero="orderInfo/totalMerchantDiscount" okey="orderInfo/activeCode"/>
<desc type="string" notzero="orderInfo/totalMerchantDiscount" okey="orderInfo/activeName"/> <desc type="string" notzero="orderInfo/totalMerchantDiscount" okey="orderInfo/activeName"/>
<offer type="int" notzero="orderInfo/totalMerchantDiscount" okey="orderInfo/totalMerchantDiscount"/> <offer type="int" notzero="orderInfo/totalMerchantDiscount" okey="orderInfo/totalMerchantDiscount"/>
<channel type="string" notzero="orderInfo/totalMerchantDiscount" okey="partnerName"/> <channel type="string" notzero="orderInfo/totalMerchantDiscount" okey="ebName"/>
</object> </object>
</promotion> </promotion>
<promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-1)" okey="orderInfo/discountOrderProducts"> <promotion type="array" notzero="orderInfo/totalMerchantDiscount" iszero="(%orderInfo/voucherType%-1)" okey="orderInfo/discountOrderProducts">
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
<seq type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="orderInfo/discountOrderProducts/lineNumber"/> <seq type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="orderInfo/discountOrderProducts/lineNumber"/>
<desc type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="orderInfo/activeName"/> <desc type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="orderInfo/activeName"/>
<offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/> <offer type="int" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="orderInfo/discountOrderProducts/merchantDiscountPrice"/>
<channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="partnerName"/> <channel type="string" notzero="orderInfo/discountOrderProducts/merchantDiscountPrice" iszero="(%productLimit%-1)" okey="ebName"/>
</promotion> </promotion>
</ReqType> </ReqType>
......
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