findone

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/CoinVo.java

@@ -40,6 +40,11 @@ public class CoinVo implements Entity {
      */
     private String shareImage;
 
+    /**
+     * 置顶图片
+     */
+    private String topImage;
+
     /**
      * 价格, 要除以100
      */
@@ -48,17 +53,17 @@ public class CoinVo implements Entity {
     /**
      * 创建时间
      */
-    private Date created;
+    private Date createTime;
 
     /**
      * 来源类型(1系统2用户上传)
      */
-    private Boolean sourceType;
+    private Integer sourceType;
 
     /**
      * 更新时间
      */
-    private Date updated;
+    private Date updateTime;
 
     /**
      * 逻辑删除
@@ -75,6 +80,11 @@ public class CoinVo implements Entity {
      */
     private String remark;
 
+    /**
+     * 是否设置过
+     */
+    private Integer isSetted;
+
     /**
      * 钱币额外信息
      */

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/ItemServiceImpl.java

@@ -45,7 +45,6 @@ public class ItemServiceImpl implements ItemService {
             List<CoinVo> coinVoList = new ArrayList<>();
             itemList.forEach(item -> {
                 CoinVo coinVo = convertEntity(item);
-                EntityMapper.copyAttribute(item, coinVo);
                 coinVoList.add(coinVo);
             });
             return coinVoList;
@@ -57,7 +56,6 @@ public class ItemServiceImpl implements ItemService {
 
     @Override
     public Result findDetails(CoinRequestDto coinRequestDto) {
-        Map<String, Object> map = new HashMap<>();
         try {
             Item item;
             Long itemId = coinRequestDto.getId();
@@ -67,7 +65,6 @@ public class ItemServiceImpl implements ItemService {
                 item = itemManager.findOne(coinRequestDto);
             }
             CoinVo coinVo = convertEntity(item);
-            EntityMapper.copyAttribute(item, coinVo);
             return Result.success(coinVo);
         } catch (Exception e) {
             logger.error("钱币设置查询明细 error : {}", e);
@@ -103,6 +100,7 @@ public class ItemServiceImpl implements ItemService {
                 paramMap.put("topImage", url);
                 item.setTopImage(url);
             }
+            item.setIsStd(coinRequestDto.getIsStd()==0?false:true);
             itemManager.setCoin(item);
 
             //记录钱币设置的操作日志

ch-core/src/main/resources/application-dev.yml

@@ -161,4 +161,9 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
     serialization:
-      write-dates-as-timestamps: false
+      write-dates-as-timestamps: false
\ No newline at end of file
+
+server:
+  servlet:
+    session:
+      timeout: 720
\ No newline at end of file

ch-core/src/main/resources/application-prod.yml

@@ -157,3 +157,7 @@ spring:
     password: Jyt4gT06qdRZnC1z
     database: 0
 
+server:
+  servlet:
+    session:
+      timeout: 720
\ No newline at end of file

ch-dao/src/main/java/com/wwdz/ch/db/manager/impl/BidRecordManagerImpl.java

@@ -51,6 +51,7 @@ public class BidRecordManagerImpl implements BidRecordManager {
         JdbcHelper.ifPresent(dto.getStartBidTime(), criteria :: andBidTimeGreaterThanOrEqualTo);
         JdbcHelper.ifPresent(dto.getEndBidTime(), criteria :: andBidTimeLessThanOrEqualTo);
         PageHelper.startPage(dto.getPage(), dto.getLimit());
+        example.setOrderByClause("id desc");
         return bidRecordMapper.selectByExample(example);
     }