Skip to content

F
fmcoupon-linux
Commit fb53ac55 by xiaojing.zhang
Options

Merge branch 'master' of gitlab.freemud.com:dingda.li/fmcoupon-linux

parents 9e23efdd cf71e35a
Showing with 5 additions and 20 deletions
Config/CoCo/Client.xml
...@@ -169,6 +169,11 @@ ...@@ -169,6 +169,11 @@
<ReqType key="fm_cmd" value="10039"> <ReqType key="fm_cmd" value="10039">
<status_code type="int" okey="resultCode"> <status_code type="int" okey="resultCode">
<maping mkey="1" mvalue="100"/> <maping mkey="1" mvalue="100"/>
<maping mkey="68" mvalue="68"/>
<maping mkey="70" mvalue="70"/>
<maping mkey="72" mvalue="72"/>
<maping mkey="69" mvalue="100"/>
<maping mkey="71" mvalue="71"/>
<maping mkey="x6001" mvalue="21"/> <maping mkey="x6001" mvalue="21"/>
<maping mkey="x6002" mvalue="22"/> <maping mkey="x6002" mvalue="22"/>
<maping mkey="x6003" mvalue="23"/> <maping mkey="x6003" mvalue="23"/>
...@@ -201,16 +206,6 @@ ...@@ -201,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>
...@@ -299,16 +294,6 @@ ...@@ -299,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