diff --git a/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java b/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java index 1b38a96..40c633d 100644 --- a/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java +++ b/src/main/java/com/yxt/yythmall/api/appletgiftbag/MyGoodsVo.java @@ -17,6 +17,8 @@ public class MyGoodsVo { private String remark; //备注 private String type; //0 百姓菜窖 1 精品菜窖 2 企业菜窖 private String specificationUnit; //规格单位 + private String unitName; //份 + private String count="0"; diff --git a/src/main/java/com/yxt/yythmall/api/lpkgiftcard/GoodsTypeVo.java b/src/main/java/com/yxt/yythmall/api/lpkgiftcard/GoodsTypeVo.java index 7f5e035..6a6dca4 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgiftcard/GoodsTypeVo.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgiftcard/GoodsTypeVo.java @@ -10,4 +10,5 @@ import lombok.Data; public class GoodsTypeVo { private String name; private String sid; + private String count; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java index 049dc7b..92db9c9 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsQuery.java @@ -12,4 +12,6 @@ import lombok.Data; @Data public class LpkGoodsQuery implements Query { private String name; + private String customerSid; + private String affiliation; } diff --git a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java index d429b67..b1db54e 100644 --- a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java +++ b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrder.java @@ -29,6 +29,7 @@ public class OrdOrder { private String name; private int timeRemarks; private String returnUrl; + private String vegeCellarType; } diff --git a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java index 7928cae..d8ec4c5 100644 --- a/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java +++ b/src/main/java/com/yxt/yythmall/api/ordorder/OrdOrderDto.java @@ -32,5 +32,6 @@ public class OrdOrderDto implements Dto { private int timeRemarks; private String returnUrl; private String customerSid; + private String vegeCellarType; //菜窖类型 0 百姓菜窖 1 精品菜窖 2 企业菜窖 private List ordOrderDetailsVoList; } diff --git a/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellar.java b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellar.java new file mode 100644 index 0000000..66d267a --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellar.java @@ -0,0 +1,29 @@ +package com.yxt.yythmall.api.vegetablecellar; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/12/8 9:10 + */ +@Data +public class VegetableCellar { + private String id; + private String sid= UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; +// private String isEnable; + private String goodsSid; + private String customerSid; + private String affiliation; + private String goodsNumber; + private String totalNumber; + + + +} diff --git a/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarDto.java b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarDto.java new file mode 100644 index 0000000..639fcf2 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarDto.java @@ -0,0 +1,30 @@ +package com.yxt.yythmall.api.vegetablecellar; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/12/8 9:11 + */ +@Data +public class VegetableCellarDto implements Dto { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String recordId; + private String recordSid; + private String giftbagSid; + private String serialNumber; + private String code; + private String codeKey; + private String state; + private String grantName; + private String grantDate; + private String customerSid; + private String customerMobile; + private String Num; + private String cardArea; +} diff --git a/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarQuery.java b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarQuery.java new file mode 100644 index 0000000..c702a43 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarQuery.java @@ -0,0 +1,15 @@ +package com.yxt.yythmall.api.vegetablecellar; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/12/8 9:11 + */ +@Data +public class VegetableCellarQuery implements Query { + private String startDate; //开始时间 + private String endDate; //结束时间 + private String countNumber; //总数 +} diff --git a/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarVo.java b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarVo.java new file mode 100644 index 0000000..a482817 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/api/vegetablecellar/VegetableCellarVo.java @@ -0,0 +1,19 @@ +package com.yxt.yythmall.api.vegetablecellar; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/12/8 9:11 + */ +@Data +public class VegetableCellarVo implements Vo { + private String sid; + private String buildDate; //创建时间 + private String countNumber; //总数 + private String startNumber; //起始号 + private String endNumber; //结束号 + private String bagName; + private String grantCountNumber; //发放总数 +} diff --git a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java index 10d84dc..58332ab 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.java @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.yythmall.api.appletgiftbag.GiftBagGoods; import com.yxt.yythmall.api.appletgiftbag.GiftBagGoodss; import com.yxt.yythmall.api.appletgiftbag.MyGoodsVo; +import com.yxt.yythmall.api.lpkgiftcard.LpkGiftCardQuery; import com.yxt.yythmall.api.lpkgoods.LpkGoods; +import com.yxt.yythmall.api.lpkgoods.LpkGoodsQuery; import com.yxt.yythmall.api.lpkgoods.LpkGoodsVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -29,6 +31,6 @@ public interface LpkGoodsMapper extends BaseMapper { LpkGoods getGoodsByName(@Param("goodName") String goodName); List getAllGoodsApplet(); - List getGoodsApplet(); + List getGoodsApplet( @Param("query") LpkGoodsQuery query); List getAllGoodsApplets(); } 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 934673d..bfaa550 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml +++ b/src/main/java/com/yxt/yythmall/biz/lpkgoods/LpkGoodsMapper.xml @@ -81,19 +81,23 @@ order by createTime desc + select + r.sid, + date_format(r.buildDate, '%Y-%m-%d') as buildDate, + r.countNumber, + r.startNumber, + r.endNumber, + g.name as bagName + from emp_card_build_record as r + left join lpk_giftbag as g on r.giftbagSid = g.sid + + ${ew.sqlSegment} + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarRest.java b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarRest.java new file mode 100644 index 0000000..31ac31b --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarRest.java @@ -0,0 +1,29 @@ +package com.yxt.yythmall.biz.vegetablecellar; + +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.vegetablecellar.VegetableCellarDto; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellarQuery; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellarVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/12/8 9:19 + */ +@Api(tags = "企业卡生成记录") +@RestController +@RequestMapping("vegetablecellar") +public class VegetableCellarRest { + @Autowired + VegetableCellarService VegetableCellarService; + @ApiOperation("创建记录列表") + @PostMapping("/addGoods") + public ResultBean addGoods(@RequestParam("mainSid") String mainSid) { + return VegetableCellarService.addGoods(mainSid); + } +} diff --git a/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java new file mode 100644 index 0000000..23f784c --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/vegetablecellar/VegetableCellarService.java @@ -0,0 +1,57 @@ +package com.yxt.yythmall.biz.vegetablecellar; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +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.ordorder.OrdOrder; +import com.yxt.yythmall.api.ordorderdetails.OrdOrderDetail; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellar; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellarDto; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellarQuery; +import com.yxt.yythmall.api.vegetablecellar.VegetableCellarVo; +import com.yxt.yythmall.biz.empcard.EmpCardService; +import com.yxt.yythmall.biz.ordorder.OrdOrderService; +import com.yxt.yythmall.biz.ordorderdetails.OrdOrderDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/12/8 9:19 + */ +@Service +public class VegetableCellarService extends MybatisBaseService { + + @Autowired + OrdOrderService ordOrderService; + @Autowired + OrdOrderDetailService ordOrderDetailService; + public ResultBean addGoods(String mainSid) { + ResultBean rb = ResultBean.fireFail(); + OrdOrder ordOrder=ordOrderService.getOne(new QueryWrapper().eq("mainSid",mainSid)); + List detailList=ordOrderDetailService.list(new QueryWrapper().eq("orderSid",ordOrder.getSid())); + for(OrdOrderDetail detail:detailList){ + VegetableCellar vegetableCellar=baseMapper.selectOne(new QueryWrapper().eq("customerSid",ordOrder.getUserSid()) + .eq("goodsSid",detail.getGoodsSid()).eq("affiliation",ordOrder.getVegeCellarType())); + if(vegetableCellar==null){ + VegetableCellar vegetable=new VegetableCellar(); + vegetable.setAffiliation(ordOrder.getVegeCellarType()); + vegetable.setGoodsSid(detail.getGoodsSid()); + vegetable.setGoodsNumber(String.valueOf(detail.getPartNumber())); + vegetable.setCustomerSid(ordOrder.getUserSid()); + baseMapper.insert(vegetable); + }else{ + vegetableCellar.setGoodsNumber(String.valueOf(Double.valueOf(vegetableCellar.getGoodsNumber())+Double.valueOf(detail.getPartNumber()))); + baseMapper.updateById(vegetableCellar); + } + } + return rb.success().setMsg("成功"); + } +} diff --git a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java index 850064b..b96b996 100644 --- a/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java +++ b/src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java @@ -63,6 +63,8 @@ public class SaTokenConfigure implements WebMvcConfigurer { .excludePathPatterns("/shoppingcart/getGoodsWeight") .excludePathPatterns("/shoppingcart/shoppingCartList") .excludePathPatterns("/shoppingcart/delShoppingCart/**") + .excludePathPatterns("/lpkgoods/vegeCellarTypeList") + .excludePathPatterns("/vegetablecellar/addGoods/**") .excludePathPatterns("/lpkgoods/vegeCellarList") .excludePathPatterns("/lpkgiftcard/bindAllCard"); }