This commit is contained in:
2024-01-23 17:19:16 +08:00
parent 0312d551d2
commit 77981b9a73
4 changed files with 19 additions and 3 deletions

View File

@@ -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> giftBagGoods;
private List<RecommendRecord> recordList;
private List<NewcomerRecoRecordVo> newcomerRecoRecordVos;
public String getPrice() {
DecimalFormat decimalFormat = new DecimalFormat("#0.00");

View File

@@ -125,6 +125,6 @@
order by createTime desc
</select>
<select id="getType" resultType="com.yxt.yythmall.api.lpkgoods.GoodsTypeVo">
select name , id as id from pms_product_category where parent_id=0
select name , id as id from pms_product_category where parent_id=0 and show_status=1
</select>
</mapper>

View File

@@ -97,9 +97,14 @@ public class NewcomerRecoRecordService extends MybatisBaseService<NewcomerRecoRe
}
public ResultBean recordList(String customerSid) {
ResultBean rb = new ResultBean();
AppletGiftBagVo vo=new AppletGiftBagVo();
List<NewcomerRecoRecordVo> vos=baseMapper.recordList(customerSid);
for (NewcomerRecoRecordVo newcomerRecoRecordVo : vos) {
// lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid"))
}
vo.setNewcomerRecoRecordVos(vos);
// List<NewcomerRecoRecordVo> vos=baseMapper.recordList(customerSid);
// AppletGiftBagVo vo=new AppletGiftBagVo();
// AppletGiftBag bag=baseMapper.selectOne(new QueryWrapper<AppletGiftBag>().eq("sid","e49555f2-5370-45b0-9637-aa4d54c22e31"));
// baseMapper.recordList()
// vos.forEach(s->{

View File

@@ -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<OrdOrderMapper, OrdOrder
result.setTrade_no_url(tradeNoUrl);
String [] a =new String []{"pay"};
result.setBus(a);
//新人限购礼包 该状态
LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().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<OrdOrderMapper, OrdOrder
result.setTrade_no_url(tradeNoUrl);
String [] a =new String []{"pay"};
result.setBus(a);
//新人限购礼包 该状态
LpkCustomer customer=lpkCustomerService.getOne(new QueryWrapper<LpkCustomer>().eq("sid",dto.getCustomerSid()));
customer.setIsPurchase("0");
lpkCustomerService.updateById(customer);
return rb.success().setData(result);
}
private static Map<String, Object> buildMessageBody(String userSid, String openId, String totalTee, List<OrdOrderDetailVo> detailVos,String returnUrl){