Merge remote-tracking branch 'origin/master'

src/main/java/com/td/boss/game/complayerlog/service/ComPlayerLogServiceImpl.java

@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
-@Transactional
 public class ComPlayerLogServiceImpl extends CommonServiceImpl<ComPlayerLogVo, ComPlayerLog, Integer> implements ComPlayerLogService {
 
     @PersistenceContext
@@ -102,7 +101,7 @@ public class ComPlayerLogServiceImpl extends CommonServiceImpl<ComPlayerLogVo, C
             playerLog.setTPart(0d);
             playerLog.setTAmount(0);
             // 1=果实
-            playerLog.setTType(1);
+            playerLog.setTType(0);
             playerLog.setBeforeAmount(goodsBeforeAmount);
             playerLog.setBeforePart(goodsBeforePart);
             // 交易后的数据

src/main/java/com/td/boss/game/complayersorce/controller/ComPlayerSorceController.java

@@ -0,0 +1,15 @@
+package com.td.boss.game.complayersorce.controller;
+
+import com.td.boss.common.controller.*;
+import com.td.boss.game.complayersorce.pojo.ComPlayerSorce;
+import com.td.boss.game.complayersorce.vo.ComPlayerSorceVo;
+import com.td.boss.game.complayersorce.service.ComPlayerSorceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/game/comPlayerSorce/")
+public class ComPlayerSorceController extends CommonController<ComPlayerSorceVo, ComPlayerSorce, Integer> {
+    @Autowired
+    private ComPlayerSorceService comPlayerSorceService;
+}

src/main/java/com/td/boss/game/complayersorce/pojo/ComPlayerSorce.java

@@ -0,0 +1,25 @@
+package com.td.boss.game.complayersorce.pojo;
+
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+@Entity
+@Table(name = "com_player_sorce")
+@Data
+public class ComPlayerSorce implements Serializable {
+    @Id
+    private Integer id;//编号
+
+    private String userId;//用户id
+
+    private Double spendCnt;//花费CNT总数
+
+    private Integer amount;//兑换数量
+
+    private Integer priceCnt;//单价
+
+    private Date createTime;//兑换时间
+
+}

src/main/java/com/td/boss/game/complayersorce/repository/ComPlayerSorceRepository.java

@@ -0,0 +1,9 @@
+package com.td.boss.game.complayersorce.repository;
+
+import com.td.boss.common.repository.*;
+import com.td.boss.game.complayersorce.pojo.ComPlayerSorce;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ComPlayerSorceRepository extends CommonRepository<ComPlayerSorce, Integer> {
+}

src/main/java/com/td/boss/game/complayersorce/service/ComPlayerSorceService.java

@@ -0,0 +1,8 @@
+package com.td.boss.game.complayersorce.service;
+
+import com.td.boss.common.service.*;
+import com.td.boss.game.complayersorce.pojo.ComPlayerSorce;
+import com.td.boss.game.complayersorce.vo.ComPlayerSorceVo;
+
+public interface ComPlayerSorceService extends CommonService<ComPlayerSorceVo, ComPlayerSorce, Integer> {
+}

src/main/java/com/td/boss/game/complayersorce/service/ComPlayerSorceServiceImpl.java

@@ -0,0 +1,23 @@
+package com.td.boss.game.complayersorce.service;
+
+import com.td.boss.common.service.*;
+import com.td.boss.game.complayersorce.pojo.ComPlayerSorce;
+import com.td.boss.game.complayersorce.vo.ComPlayerSorceVo;
+import com.td.boss.game.complayersorce.repository.ComPlayerSorceRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+@Service
+@Transactional
+public class ComPlayerSorceServiceImpl extends CommonServiceImpl<ComPlayerSorceVo, ComPlayerSorce, Integer> implements ComPlayerSorceService{
+
+    @PersistenceContext
+    private EntityManager em;
+    @Autowired
+    private ComPlayerSorceRepository comPlayerSorceRepository;
+
+
+}

src/main/java/com/td/boss/game/complayersorce/vo/ComPlayerSorceVo.java

@@ -0,0 +1,21 @@
+package com.td.boss.game.complayersorce.vo;
+
+import com.td.boss. common.pojo.PageCondition;import lombok.Data;
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ComPlayerSorceVo extends PageCondition implements Serializable {
+    private Integer id;//编号
+
+    private String userId;//用户id
+
+    private Double spendCnt;//花费CNT总数
+
+    private Integer amount;//兑换数量
+
+    private Integer priceCnt;//单价
+
+    private Date createTime;//兑换时间
+
+}