Merge branch 'dev' into 'dev'

在卡券支付的返回结果中添加一个字段coupon_price，表示购券金额

See merge request !2

FMVip_LXJ/task/fmp_redeem.cpp

@@ -297,11 +297,13 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
             QJsonObject pay_id;
             if(couponType == 0) //商品券
             {
-                pay_id["pay_amount"] = SearchJsonObject(json, "paid").toInt();
+                pay_id["pay_amount"] = SearchJsonObject(json, "price_act").toInt();
+                pay_id["coupon_price"] = SearchJsonObject(json, "paid").toInt();
             }
             else if(couponType == 1) //代金券
             {
                 pay_id["pay_amount"] = SearchJsonObject(json, "amount").toInt();
+                pay_id["coupon_price"] = pay_id["pay_amount"];
             }
             pay_id["pay_id"] = couponType;
             pay_id["pay_str"] = act_name;