yxt_product
/
yxt-yyth-biz
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1/9

master
wangpengfei 1 year ago
parent
fc65b7dc51
commit
46c21d588c
7 changed files with 170 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGifGoodsVo.java
  2. 1
      src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
  3. 4
      src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java
  4. 4
      src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsService.java
  5. 15
      src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
  6. 74
      src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
  7. 3
      src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java

20
src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGifGoodsVo.java
View File

@ -0,0 +1,20 @@
package com.yxt.yyth.api.lpkgiftbaggoods;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/1/9 11:04
*/
@Data
public class LpkGifGoodsVo {
private String goodsName;
private String goodsSid;
private double goodsNumber;
private double residue;
private String unitName;
private String specificationUnit;
private String weight;
private String remarks;
private String content;
}

1
src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java
View File

@ -54,6 +54,7 @@ public class AppletVo {
private String isEnable;
private String isTransfer;//是否转增 0 未转赠 1 转赠
private String type;//是否转增 1亲情卡 2家庭 3 企业
private String logo;//查询标识 1亲情卡 2家庭 3 企业
public String getStart() {
SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");

4
src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java
View File

@ -2,6 +2,7 @@ package com.yxt.yyth.biz.lpkgiftbaggoods;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoods;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo;
import org.apache.ibatis.annotations.Mapper;
@ -23,7 +24,8 @@ public interface LpkGiftBagGoodsMapper extends BaseMapper<LpkGiftBagGoods> {
@Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl,goods.price,goods.unitName,goods.remarks " +
" from lpk_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}")
List<LpkGiftBagGoodsVo> getGoodsByBagSid(String sid);
@Select("select * from lpk_giftcard card left JOIN lpk_giftbag_goods g on card.giftbagSid=g.giftbagSid where card.sid=#{sid}")
List<LpkGifGoodsVo> getGoodsByGiftSid(String sid);
List<LpkGiftBagGoods> getRecordsByBagSid(@Param("sid") String sid);
int saveBagGoods(@Param("bagGoods") List<LpkGiftBagGoods> bagGoods);

4
src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsService.java
View File

@ -2,6 +2,7 @@ package com.yxt.yyth.biz.lpkgiftbaggoods;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoods;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo;
import org.apache.ibatis.annotations.Param;
@ -27,6 +28,9 @@ public class LpkGiftBagGoodsService extends MybatisBaseService<LpkGiftBagGoodsMa
public List<LpkGiftBagGoodsVo> getGoodsByBagSid(String sid) {
return baseMapper.getGoodsByBagSid(sid);
}
public List<LpkGifGoodsVo> getGoodsByGiftSid(String sid) {
return baseMapper.getGoodsByGiftSid(sid);
}
public int saveBagGoods(List<LpkGiftBagGoods> bagGoods) {

15
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml
View File

@ -26,6 +26,9 @@
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '1'
END logo,
CASE
WHEN card.sid IS NOT NULL THEN '1'
END type,
@ -56,9 +59,14 @@
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '2'
END logo,
CASE card.isSenior
WHEN 1 THEN '1'
when 2 then '2'
END type,
CASE
WHEN card.sid IS NOT NULL THEN '亲情菜窖'
CASE card.isSenior
WHEN 1 THEN '家庭菜窖'
WHEN 2 THEN '亲情菜窖'
END pName,
card.startDate AS dateStart,
card.endDate AS dateEnd,
@ -84,6 +92,9 @@
WHEN 4 THEN '已经预约提货(预约部分提货)'
WHEN 5 THEN '已经提取完成'
END stateValue,
CASE
WHEN card.sid IS NOT NULL THEN '3'
END logo,
CASE
WHEN card.sid IS NOT NULL THEN '3'
END type,

74
src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
View File

@ -39,6 +39,7 @@ import com.yxt.yyth.api.lpkcardqrcode.LpkCardQrcodeDto;
import com.yxt.yyth.api.lpkgiftbag.GiftBagGoods;
import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag;
import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagDto;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoods;
import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo;
import com.yxt.yyth.api.lpkgiftcard.*;
@ -214,13 +215,84 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
if (StringUtils.isNotBlank(query.getCustomerSid())) {
qw.eq("customerSid", query.getCustomerSid());
}
System.out.println(query.getCustomerSid());
IPage<LpkGiftCard> page = PagerUtil.queryToPage(pq);
IPage<AppletVo> list = baseMapper.getGifCardsByCustomerSid(page, query.getCustomerSid());
list.getRecords().forEach(s->{
if(s.getLogo().equals("1")){
//家庭卡
List<LpkGifGoodsVo> list1=LpkGiftBagGoodsService.getGoodsByGiftSid(s.getSid());
list1.forEach(l->{
AppletVo vo= getGifCardsBySid(s.getSid()).getData();
List<GoodsVo> vos=vo.getGoodsVos();
vos.forEach(d->{
if(l.getGoodsSid().equals(d.getGoodsSid())){
l.setContent("剩余"+d.getLNum()+"份/"+"共"+l.getGoodsNumber()+"份");
}
});
l.setRemarks(l.getWeight()+l.getSpecificationUnit()+"/"+l.getUnitName());
});
}else if(s.getLogo().equals("2")){
//亲情卡
} else if (s.getLogo().equals("3")) {
//企业卡
}
});
PagerVo<AppletVo> p = PagerUtil.pageToVo(list, null);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
return rb.success().setData(p);
}
public ResultBean<AppletVo> getGifCardsBySid(String sid) {
ResultBean rb = new ResultBean().fail();
AppletVo vo = baseMapper.getGifCardBySid(sid);
List<LpkGiftBagGoodsVo> list = LpkGiftBagGoodsService.getGoodsByBagSid(vo.getGiftbagSid());
List<GoodsVo> goodsVos = new ArrayList<>();
list.forEach(s -> {
LpkReserveOrderGoods goods = lpkReserveOrderGoodsService.getReserveByCardSid(vo.getSid(), s.getGoodsSid()).getData();
EmpCardGiftVo vo1=empCardGiftService.getEmpCardGoods(vo.getSid(),s.getGoodsSid()).getData();
GoodsVo goodsVo = new GoodsVo();
goodsVo.setGoods(s.getGoodsName());
goodsVo.setNum(s.getGoodsNumber());
goodsVo.setGoodsSid(s.getGoodsSid());
goodsVo.setRemarks(s.getRemarks());
goodsVo.setUnitName(s.getUnitName());
goodsVo.setPic(urlPrefix + s.getPicUrl());
if (vo.getState().equals("已过期")) {
goodsVo.setLNum(0);
goodsVos.add(goodsVo);
} else if (!vo.isShowBtn()) {
goodsVo.setLNum(0);
goodsVos.add(goodsVo);
} else {
if (null != goods && null!=vo1) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber()-vo1.getGoodsNumber());
// goodsVo.setSelect(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
} else if(null != vo1){
if (vo1.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber()- vo1.getGoodsNumber());
goodsVo.setSelect(0);
}
}else if(null != goods) {
if (goods.getGoodsNumber() != s.getGoodsNumber()) {
goodsVo.setLNum(s.getGoodsNumber() - goods.getGoodsNumber());
goodsVo.setSelect(0);
}
}else {
goodsVo.setLNum(s.getGoodsNumber());
// goodsVo.setSelect(s.getGoodsNumber());
goodsVo.setSelect(0);
}
goodsVos.add(goodsVo);
}
});
vo.setGoodsVos(goodsVos);
return rb.success().setData(vo);
}
public ResultBean<AppletVo> getGifCardBySid(String sid) {
ResultBean rb = new ResultBean().fail();
AppletVo vo = baseMapper.getGifCardBySid(sid);

3
src/main/java/com/yxt/yyth/biz/ordorder/OrdOrderService.java
View File

@ -92,7 +92,6 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
payUrl.setParams(aVoid);
OrderUrl orderUrl=new OrderUrl();
// orderUrl.setPage(null);
OrderParams orderParams=new OrderParams();
orderParams.setMainSid("");
orderUrl.setParams(orderParams);
@ -107,7 +106,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
result.setPay_url(payUrl);
result.setTrade_no_url(tradeNoUrl);
result.setBus(new String[0]);
System.out.println(result);
return rb.success().setData(result);
}

Write Preview
Loading…
Cancel
Save