From: yunpeng.ma <yunpeng.ma@supwisdom.com>
Date: Fri, 25 Sep 2020 05:59:05 +0000 (+0800)
Subject: 积分类型添加名称
X-Git-Tag: 1.0.26^2~4
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=0655056c895bb6a96fb8188d3224a9bb7b0487d9;p=epayment%2Ffood_payapi.git

积分类型添加名称
---

diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPointsdtl.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPointsdtl.java
index 8d421597..34c2f98a 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPointsdtl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TPointsdtl.java
@@ -52,6 +52,17 @@ public class TPointsdtl {
   @Transient
   private TPointsMain tPointsMain;
 
+  @Transient
+  private String typename;
+
+  public String getTypename() {
+    return typename;
+  }
+
+  public void setTypename(String typename) {
+    this.typename = typename;
+  }
+
   public TPointsMain gettPointsMain() {
     return tPointsMain;
   }
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
index 891af93d..161b1c75 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/util/TradeDict.java
@@ -127,6 +127,9 @@ public class TradeDict {
   public static final String TASK_FLAG_FINISH = "task";     //任务
   public static final String CONSUME_FLAG_OUTPOINTS = "outpoints";     //过期积分
 
+
+  public static final String DICT_POINTSDTL_TYPE = "pointsDtlTypeName";     //字典表类型
+
   //积分任务表的类型tb_points_task
   public static final String TASK_FLAG_FIRST = "first";
   public static final String TASK_FLAG_EVEDAY = "everyday";
diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
index e566af09..531e3a2b 100644
--- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
@@ -175,6 +175,8 @@ public class PointsServiceImpl implements PointsService {
 /*      page.getContent().get(0).settPointsMain(tPointsMain);*/
       for (TPointsdtl temp:page.getContent()){
         temp.settPointsMain(tPointsMain);
+        TDictionary byDicttypeAndDictval = dictionaryDao.getByDicttypeAndDictval(TradeDict.DICT_POINTSDTL_TYPE, temp.getType());
+        temp.setTypename(byDicttypeAndDictval.getDicttypename());
       }
     }
     return new PageResult<>(page);