完善卡券核销和冲正相关问题

fmp_epay @ 96735c51

-Subproject commit c988b99a3f696f278ec4e8ef323f37a2892f4dc0
+Subproject commit 96735c51448644c6ac421c3ccb8e022a8fbf4997

fmp_redeem/fmp_redeem.cpp

@@ -331,13 +331,16 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
             {
                 redeemResult["discount"] = SearchJsonObject(json, "paid").toInt();
                 redeemResult["pid"] = SearchJsonObject(json, "pid").toString();
+                redeemResult["couponType"] = "20004";
             }
             else if(couponType == 1) //代金券
             {
                 redeemResult["discount"] = SearchJsonObject(json, "amount").toInt();
+                redeemResult["couponType"] = "20003";
             }
-            redeemResult["couponType"] = act_name;
+            redeemResult["couponDesc"] = act_name;
             redeemResult["code"] = coupon;
+            redeemResult["redeem_json"] = _redeem_json;
         }
             break;
         default: