|
|
@@ -26,6 +26,7 @@ import beilv.vipCardLog.service.IVipCardLogService;
|
|
|
import beilv.wx.pay.controller.WxPayController;
|
|
|
import beilv.wx.pay.domain.vo.AppRefundParam;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.collections4.MapUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
@@ -38,6 +39,8 @@ import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
import static beilv.competition.domain.Constant.ORDER_QUEUE;
|
|
|
|
|
|
@@ -393,6 +396,11 @@ public class CardAppController extends BaseController {
|
|
|
@ResponseBody
|
|
|
public AjaxResult selectPointsTransactionHistory(@RequestBody VipCardAmountLog amountLog){
|
|
|
HashMap<String, Object> result = new HashMap<>();
|
|
|
+ List<Map<String, Object>> maps = amountLogService.selectVipCardAmountLogListAndOrderInfo(amountLog);
|
|
|
+ maps.forEach(map->{
|
|
|
+ map.put("createTime", MapUtils.getString(map,"createTime").replace("T", " "));
|
|
|
+ });
|
|
|
+
|
|
|
result.put("historyList",amountLogService.selectVipCardAmountLogListAndOrderInfo(amountLog));
|
|
|
if("1".equals(amountLog.getAmountType())){
|
|
|
result.put("balance", vipCardService.selectVipCardByUserId(amountLog.getUserId()).getBalance());
|