Merge remote-tracking branch 'origin/information' into information

netflix-dao/src/main/java/com/cyksj/model/entity/UserGalaxycoinRecord.java

@@ -1,5 +1,7 @@
 package com.cyksj.model.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,19 +14,37 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@SearchBean(tables = "user_galaxycoin_record")
+@SearchBean(tables = "user_galaxycoin_record ur" +
+        " left join user u on ur.user_id = u.id")
 public class UserGalaxycoinRecord extends BaseEntity{
+
+    @DbField("u.nickname")
+    @TableField(exist = false)
+    private String nickname;
+
+    @DbField("u.headimgurl")
+    @TableField(exist = false)
+    private String headimgurl;
+
+    @DbField("ur.user_id")
     private Long userId;
 
     /**
      * 主订单id
      */
+    @DbField("ur.m_oid")
     private Long mOid;
 
+    @DbField("ur.galaxycoin")
     private BigDecimal galaxycoin;
 
+    @DbField("ur.remain_galaxycoin")
+    private BigDecimal remainGalaxycoin;
+
+    @DbField("ur.remark")
     private String remark;
 
+    @DbField("ur.source")
     private Source source;
 
     @Getter

netflix-service/src/main/java/com/cyksj/service/user/impl/UserBenefitsServiceImpl.java

@@ -204,6 +204,7 @@ public class UserBenefitsServiceImpl implements UserBenefitsService {
 				record.setMOid(mOid);
 				record.setUserId(userId);
 				record.setGalaxycoin(addGalaxycoin);
+				record.setRemainGalaxycoin(user.getGalaxycoin().add(addGalaxycoin));
 				record.setSource(source);
 				record.setRemark(source.getDesc());
 				userGalaxycoinRecordMapper.insert(record);