From 96c6d9aa624614e22aa3bf79ed52a8a1b4f5715a Mon Sep 17 00:00:00 2001
From: Tang Cheng <cheng.tang@supwisdom.com>
Date: Sat, 13 Apr 2019 20:38:43 +0800
Subject: [PATCH] =?utf8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../consume/controller/consume_service.kt     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

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 06f3cae9..b0e1331f 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
@@ -3,7 +3,6 @@ package com.supwisdom.dlpay.consume.controller
 import com.supwisdom.dlpay.consume.AccountHolder
 import com.supwisdom.dlpay.consume.CallService
 import com.supwisdom.dlpay.consume.PersonTransBuilder
-import com.supwisdom.dlpay.consume.domain.TUserdtl
 import com.supwisdom.dlpay.consume.service.AccountUtilServcie
 import com.supwisdom.dlpay.consume.service.PaytypeService
 import com.supwisdom.dlpay.consume.service.PersonBalancePayService
@@ -73,26 +72,26 @@ class ConsumeController {
                    stuempno: String, shopid: String, transdate: String, transtime: String,
                    outtradeno: String, payinfo: String,feetype:String): ResponseEntity<Any> {
         //一卡通支付款 112240
-        var fee_drsubjectno = ""
-        var fee_crsubjectno = ""
+        var feeDrsubjectno = ""
+        var feeCrsubjectno = ""
         var summary = ""
         var realamount = 0
         when(feetype){
             TradeDict.FEETYPE_CONSUME_MEALER->{
-                fee_drsubjectno="112240"
-                fee_crsubjectno = "2002"
+                feeDrsubjectno="112240"
+                feeCrsubjectno = "2002"
                 realamount = amount
                 summary = "收搭伙费"
             }
             TradeDict.FEETYPE_CONSUME_DISCOUNT->{
-                fee_drsubjectno = "2003"
-                fee_crsubjectno = shopid
+                feeDrsubjectno = "2003"
+                feeCrsubjectno = shopid
                 realamount = amount - manageFee
                 summary = "优惠折扣"
             }
         }
 
-        var person = personService.getPersonByThirdUniqueIdenty(stuempno)
+        val person = personService.getPersonByThirdUniqueIdenty(stuempno)
         val dtl = PersonTransBuilder.newBuilder(accountUtilServcie)
                 .setTransDatetime(transdate, transtime)
                 .selectPaytype(PaytypeUtil.YKTPAY, payinfo)
@@ -103,8 +102,8 @@ class ConsumeController {
                 .addDetail(AccountHolder.subject("112240"),
                         AccountHolder.shop(shopid),
                         realamount / 100.0, "一卡通支付")
-                .addDetail(AccountHolder.subject(fee_drsubjectno),
-                        AccountHolder.subject(fee_crsubjectno),
+                .addDetail(AccountHolder.subject(feeDrsubjectno),
+                        AccountHolder.subject(feeCrsubjectno),
                         manageFee / 100.0, summary)
                 .done(personBalancePayService, false)
         return ResponseEntity.ok(dtl)
-- 
2.17.1