diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java index b80225b..6194cff 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java +++ b/src/main/java/com/yxt/yythmall/api/appletgiftbag/AppletGiftBagVo.java @@ -1,6 +1,7 @@ package com.yxt.yythmall.api.appletgiftbag; import com.yxt.common.core.vo.Vo; +import com.yxt.yythmall.api.newcomerrecorecord.NewcomerRecoRecordVo; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.NoArgsConstructor; @@ -32,6 +33,7 @@ public class AppletGiftBagVo implements Vo { private String weight="0";//重量 private List giftBagGoods; private List recordList; + private List newcomerRecoRecordVos; public String getPrice() { DecimalFormat decimalFormat = new DecimalFormat("#0.00"); diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml index 2628ce9..353c422 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml @@ -125,6 +125,6 @@ order by createTime desc \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java index 5a08635..2d362f4 100644 --- a/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java +++ b/src/main/java/com/yxt/yythmall/biz/newcomerrecorecord/NewcomerRecoRecordService.java @@ -97,9 +97,14 @@ public class NewcomerRecoRecordService extends MybatisBaseService vos=baseMapper.recordList(customerSid); + for (NewcomerRecoRecordVo newcomerRecoRecordVo : vos) { +// lpkCustomerService.getOne(new QueryWrapper().eq("sid")) + } + vo.setNewcomerRecoRecordVos(vos); + -// List vos=baseMapper.recordList(customerSid); -// AppletGiftBagVo vo=new AppletGiftBagVo(); // AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31")); // baseMapper.recordList() // vos.forEach(s->{ diff --git a/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java b/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java index 6c8208d..6e111f7 100644 --- a/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java +++ b/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java @@ -12,6 +12,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss; +import com.yxt.yythmall.api.lpkcustomer.LpkCustomer; import com.yxt.yythmall.api.lpkcustomer.LpkCustomerVo; import com.yxt.yythmall.api.lpkgoods.LpkGoods; import com.yxt.yythmall.api.lpkstore.LpkStore; @@ -250,6 +251,10 @@ public class OrdOrderService extends MybatisBaseService().eq("sid",dto.getCustomerSid())); + customer.setIsPurchase("0"); + lpkCustomerService.updateById(customer); return rb.success().setData(result); } @Transactional(rollbackFor = Exception.class) @@ -351,6 +356,10 @@ public class OrdOrderService extends MybatisBaseService().eq("sid",dto.getCustomerSid())); + customer.setIsPurchase("0"); + lpkCustomerService.updateById(customer); return rb.success().setData(result); } private static Map buildMessageBody(String userSid, String openId, String totalTee, List detailVos,String returnUrl){