From 0f3e6383c48ef1eee160fa3b87fbd14b19f950e5 Mon Sep 17 00:00:00 2001
From: qiaowei <jov123@163.com>
Date: Fri, 12 Apr 2019 16:16:44 +0800
Subject: [PATCH] =?utf8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../dlpay/framework/util/TradeDict.java       | 12 ++++++++
 .../consume/controller/consume_service.kt     | 28 +++++++++++++++----
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java b/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
index 63eee646..6163c00d 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
@@ -47,4 +47,16 @@ public class TradeDict {
   public static final String PAYTYPE_CASH="cash";
   public static final String PAYTYPE_BALANCE="balance";
 
+
+  /**
+   * feetype
+   * -消费，折扣、搭伙费
+   * -充值，优惠、服务费（手续费）
+   * */
+
+  public static final String FEETYPE_CONSUME_MEALER="mealer";
+  public static final String FEETYPE_CONSUME_DISCOUNT="discount";
+
+  public static final String PAYTYPE_DPS_COUPON="coupon";
+  public static final String PAYTYPE_DPS_SERVICEFEE="servicefee";
 }
diff --git a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt
index 82406a61..6b8c4194 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/consume/controller/consume_service.kt
@@ -73,8 +73,24 @@ class ConsumeController {
                    stuempno: String, shopid: String, transdate: String, transtime: String,
                    outtradeno: String, payinfo: String,feetype:String): ResponseEntity<Any> {
         //一卡通支付款 112240
-        var drsubjectno = ""
-        var ccsubjectno = ""
+        var fee_drsubjectno = ""
+        var fee_crsubjectno = ""
+        var summary = ""
+        var realamount = 0
+        when(feetype){
+            TradeDict.FEETYPE_CONSUME_MEALER->{
+                fee_drsubjectno="112240"
+                fee_crsubjectno = "2002"
+                realamount = amount
+                summary = "收搭伙费"
+            }
+            TradeDict.FEETYPE_CONSUME_DISCOUNT->{
+                fee_drsubjectno = "2003"
+                fee_crsubjectno = shopid
+                realamount = amount - manageFee
+                summary = "优惠折扣"
+            }
+        }
 
         var person = personService.getPersonByThirdUniqueIdenty(stuempno)
         val dtl = PersonTransBuilder.newBuilder(accountUtilServcie)
@@ -86,10 +102,10 @@ class ConsumeController {
                 .chooseTradetype(Tradetype.CONSUME)
                 .addDetail(AccountHolder.subject("112240"),
                         AccountHolder.shop(shopid),
-                        amount / 100.0, "一卡通支付")
-                .addDetail(AccountHolder.subject("112240"),
-                        AccountHolder.subject("2002"),
-                        manageFee / 100.0, "搭伙费")
+                        realamount / 100.0, "一卡通支付")
+                .addDetail(AccountHolder.subject(fee_drsubjectno),
+                        AccountHolder.subject(fee_crsubjectno),
+                        manageFee / 100.0, summary)
                 .done(personBalancePayService, false)
         return ResponseEntity.ok(dtl)
     }
-- 
2.17.1