2/4

src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderVo.java

@@ -40,4 +40,5 @@ public class OrdOrderVo implements Vo {
     List<OrdOrderDetail> ordOrderDetails;
     private String endTime;
     private PayResult result;
+    private long nowDate;
 }

src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java

@@ -39,6 +39,7 @@ import org.springframework.web.client.RestTemplate;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author wangpengfei
@@ -417,9 +418,21 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         qw.eq("userSid",query.getCustomerSid());
         qw.orderByDesc("createTime");
         IPage<OrdOrderVo> pagging = baseMapper.orderList(page, qw);
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for (OrdOrderVo record : pagging.getRecords()) {
            List<OrdOrderDetail> details=ordOrderDetailService.list(new QueryWrapper<OrdOrderDetail>().eq("orderSid",record.getSid()));
            List<String> urls=new ArrayList<>();
+            record.getCreateTime();
+            if(record.getPayStatus()==2){
+                //1>2 1 、1<2 -1 、1=2 0
+               int k= DateUtil.parse(sdf.format(new Date())).compareTo(DateUtil.offsetMinute(record.getCreateTime(),10));
+                if(k!=-1){
+                    record.setPayStatus(3);
+                    OrdOrder r=baseMapper.selectOne(new QueryWrapper<OrdOrder>().eq("sid",record.getSid()));
+                    r.setPayStatus(3);
+                    baseMapper.updateById(r);
+                }
+            }
            for (OrdOrderDetail detail : details) {
                 LpkGoods lpkGoods=lpkGoodsService.getOne(new QueryWrapper<LpkGoods>().eq("sid",detail.getGoodsSid()));
                 urls.add(fileUploadComponent.getUrlPrefix()+lpkGoods.getPicUrl());
@@ -427,6 +440,9 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
            record.setCount(String.valueOf(details.size()));
            record.setPicUrls(urls);
         }
+        if(query.getState().equals("2")){
+            pagging.setRecords(pagging.getRecords().stream().filter(s->s.getPayStatus()!=3).collect(Collectors.toList()));
+        }
         PagerVo<LpkStoreVo> p = PagerUtil.pageToVo(pagging, null);
         return  rb.success().setData(p);
     }
@@ -449,6 +465,8 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         }
         pagging.setOrdOrderDetails(details);
         SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        long milli = DateUtil.current();
+        pagging.setNowDate(milli);
         pagging.setEndTime(sdf1.format(DateUtil.offsetMinute(pagging.getCreateTime(),pagging.getTimeRemarks())));
         if(pagging.getPayStatus()==2){
             PayResult result=new PayResult();
@@ -488,6 +506,8 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
         }
         return  rb.success().setData(pagging);
     }
+
+
     public ResultBean changePayState(String sid) {
         ResultBean rb=new ResultBean().fail();
         if(StringUtils.isBlank(sid)){

src/main/java/com/yxt/yythmall/biz/recommendnewuserbag/RecommendNewUserBagMapper.xml

@@ -43,6 +43,7 @@
         a.price ,
         a.preferentialPrice as prefPrice
         from recommend_newuser_bag a
+        where isGrounding=1
     </select>
     <select id="getGoodsByBagSid" resultType="com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss">
         select