Merge remote-tracking branch 'origin/master'

# Conflicts: # .idea/encodings.xml # bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java # bwie-common/src/main/java/com/bwie/common/pojo/Facility.java # bwie-common/src/main/java/com/bwie/common/pojo/Goods.java # bwie-common/src/main/java/com/bwie/common/pojo/Shop.java # bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java # bwie-models/pom.xml
Merge branch 'FangShiBa'
2023-12-19 16:47:53 +08:00 · 2023-12-19 15:01:18 +08:00 · 2023-12-18 21:05:54 +08:00 · 2023-12-17 16:23:48 +08:00 · 2023-12-17 15:10:05 +08:00
19 changed files with 510 additions and 11 deletions
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@ -2,17 +2,11 @@
 <project version="4">
  <component name="Encoding">
    <file url="file://$PROJECT_DIR$/bwie-auth/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bwie-auth/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/bwie-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bwie-common/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/bwie-gateway/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bwie-gateway/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bwie-models/bwie-shopList/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/bwie-models/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bwie-models/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/bwie-mq/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/bwie-mq/src/main/resources" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
  </component>
-</project>
+</project>
--- a/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java
+++ b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java
@ -5,13 +5,37 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;

+<<<<<<< HEAD
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+=======
 import java.util.List;

+>>>>>>> origin/master
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
 public class DTOGoods {
+<<<<<<< HEAD
+    private Integer goodsId;              //商品设备中间id
+    private Integer shopId;               //商品id
+    private Integer facilityId;           //设备id
+    private Integer goodsNum;             //库存
+    private Integer goodsIsDelete;        //上下架(逻辑字段: 0上架, 1下架)
+    private String shopName;              //商品名称
+    private Double shopPrice;             //商品价格
+    private Integer typeId;               //商品类型id
+    private String facilityType;          //设备类型
+    private String facilitySite;          //设备地址
+    private Integer replenishmentUserId;  //补货员工
+    private Integer maintainUserId;       //维修员工
+    private String facilityStatic;        //设备状态
+    private Integer delId;                //删除状态
+=======

    //商品设备中间id
    private Integer goodsId;
@ -45,5 +69,6 @@ public class DTOGoods {



+>>>>>>> origin/master

 }
--- a/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOUser.java
+++ b/bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOUser.java
@ -1,9 +1,21 @@
 package com.bwie.common.pojo.DTO;

+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 /**
 * @author FangShiBa
 * @date 2023/12/16
 * @apiNote
 */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class DTOUser {
+    private Integer userId;
+
+
 }
--- a/bwie-common/src/main/java/com/bwie/common/pojo/Facility.java
+++ b/bwie-common/src/main/java/com/bwie/common/pojo/Facility.java
@ -5,11 +5,28 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;

+<<<<<<< HEAD
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+=======
+>>>>>>> origin/master
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
 public class Facility {
+<<<<<<< HEAD
+    private Integer facilityId;           //设备编号
+    private String facilityType;          //设备类型
+    private String facilitySite;          //设备地址
+    private Integer replenishmentUserId;  //补货员工
+    private Integer maintainUserId;       //维修员工
+    private String facilityStatic;        //设备状态
+    private Integer delId;                //删除状态
+=======

    //设备编号
    private Integer facilityId;
@ -27,6 +44,7 @@ public class Facility {
    private Integer delId;


+>>>>>>> origin/master



--- a/bwie-common/src/main/java/com/bwie/common/pojo/Goods.java
+++ b/bwie-common/src/main/java/com/bwie/common/pojo/Goods.java
@ -5,11 +5,26 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;

+<<<<<<< HEAD
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+=======
+>>>>>>> origin/master
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
 public class Goods {
+<<<<<<< HEAD
+    private Integer goodsId;        //商品设备中间id
+    private Integer shopId;         //商品id
+    private Integer facilityId;     //设备id
+    private Integer goodsNum;       //库存
+    private Integer goodsIsDelete;  //上下架(逻辑字段: 0上架, 1下架)
+=======

    //商品设备中间id
    private Integer goodsId;
@ -23,4 +38,5 @@ public class Goods {
    private Integer goodsIsDelete;


+>>>>>>> origin/master
 }
--- a/bwie-common/src/main/java/com/bwie/common/pojo/Sell.java
+++ b/bwie-common/src/main/java/com/bwie/common/pojo/Sell.java
@ -0,0 +1,31 @@
+package com.bwie.common.pojo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author FangShiBa
+ * @date 2023/12/18
+ * @apiNote
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class Sell {
+    private Integer sellId;
+    private Integer shopId;
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    private Date sellTime;
+    private Integer userId;
+    private Integer facilityId;
+
+
+}
--- a/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java
+++ b/bwie-common/src/main/java/com/bwie/common/pojo/Shop.java
@ -5,11 +5,25 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;

+<<<<<<< HEAD
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+=======
+>>>>>>> origin/master
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
 public class Shop {
+<<<<<<< HEAD
+    private Integer shopId;        //商品id
+    private String shopName;       //商品名称
+    private Double shopPrice;      //商品价格
+    private Integer typeId;        //商品类型id
+=======

    //商品id
    private Integer shopId;
@ -21,5 +35,6 @@ public class Shop {
    private Integer typeId;


+>>>>>>> origin/master

 }
--- a/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java
+++ b/bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java
@ -5,11 +5,30 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;

+<<<<<<< HEAD
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+=======
+>>>>>>> origin/master
@Data
@AllArgsConstructor
@NoArgsConstructor
@ToString
 public class VOGoods {
+<<<<<<< HEAD
+    private Integer goodsId;        //商品设备中间id
+    private Integer shopId;         //商品id
+    private Integer facilityId;     //设备id
+    private Integer goodsNum;       //库存
+    private Integer goodsIsDelete;  //上下架(逻辑字段: 0上架, 1下架)
+    private Double payForMoney;     //支付金额
+
+    private Integer pageNum=1;
+    private Integer pageSize=3;
+=======

    //商品设备中间id
    private Integer goodsId;
@ -27,4 +46,5 @@ public class VOGoods {
    private Integer pageSize=3;


+>>>>>>> origin/master
 }
--- a/bwie-models/bwie-buy/.gitignore
+++ b/bwie-models/bwie-buy/.gitignore
@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### IntelliJ IDEA ###
+.idea/modules.xml
+.idea/jarRepositories.xml
+.idea/compiler.xml
+.idea/libraries/
+*.iws
+*.iml
+*.ipr
+
+### Eclipse ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+### Mac OS ###
+.DS_Store
--- a/bwie-models/bwie-buy/pom.xml
+++ b/bwie-models/bwie-buy/pom.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.bwie</groupId>
+        <artifactId>bwie-models</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>bwie-buy</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>
--- a/bwie-models/bwie-buy/src/main/java/com/bwie/buy/BuyApplication.java
+++ b/bwie-models/bwie-buy/src/main/java/com/bwie/buy/BuyApplication.java
@ -0,0 +1,18 @@
+package com.bwie.buy;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+@SpringBootApplication
+@MapperScan("com.bwie.buy.dao")
+public class BuyApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(BuyApplication.class,args);
+    }
+}
--- a/bwie-models/bwie-buy/src/main/java/com/bwie/buy/controller/BuyController.java
+++ b/bwie-models/bwie-buy/src/main/java/com/bwie/buy/controller/BuyController.java
@ -0,0 +1,60 @@
+package com.bwie.buy.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.bwie.buy.service.BuyService;
+import com.bwie.common.pojo.VO.VOGoods;
+import com.bwie.common.result.Result;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+@Log4j2
+@RestController
+@RequestMapping("/buy")
+public class BuyController {
+    @Autowired
+    private BuyService service;
+    @Autowired
+    private HttpServletRequest request;
+
+    /*
+    商品列表展示,购买商品时展示
+     */
+    @PostMapping("/showGoodsList")
+    public Result showGoodsList(@RequestBody VOGoods voGoods){
+
+        log.info("功能：{商品列表展示}，请求URI：{}，请求方法：{}，请求参数：{}",
+                request.getRequestURI(), request.getMethod(),voGoods );
+        Result result=service.showGoodsList(voGoods);
+        log.info("功能：{商品列表展示}，请求URI：{}，请求方法：{}，响应参数：{}",
+                request.getRequestURI(), request.getMethod(), JSONObject.toJSONString(result));
+        return result;
+    }
+
+    /*
+    购买商品
+     */
+    @PostMapping("/buyGood")
+    public Result buyGood(@RequestBody VOGoods voGoods){
+
+        log.info("功能：{购买商品}，请求URI：{}，请求方法：{}，请求参数：{}",
+                request.getRequestURI(), request.getMethod(),voGoods );
+        Result result=service.buyGood(voGoods);
+        log.info("功能：{购买商品}，请求URI：{}，请求方法：{}，响应参数：{}",
+                request.getRequestURI(), request.getMethod(), JSONObject.toJSONString(result));
+        return result;
+    }
+
+
+
+}
--- a/bwie-models/bwie-buy/src/main/java/com/bwie/buy/dao/BuyDao.java
+++ b/bwie-models/bwie-buy/src/main/java/com/bwie/buy/dao/BuyDao.java
@ -0,0 +1,29 @@
+package com.bwie.buy.dao;
+
+import com.bwie.common.pojo.DTO.DTOGoods;
+import com.bwie.common.pojo.Sell;
+import com.bwie.common.pojo.Shop;
+import com.bwie.common.pojo.VO.VOGoods;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+@Component
+public interface BuyDao {
+
+
+    List<DTOGoods> showGoodsList(VOGoods voGoods);
+
+
+    Shop findById(@Param("shopId") Integer shopId);
+
+    void buyGood(VOGoods voGoods);
+
+    void addSell(Sell sell);
+}
--- a/bwie-models/bwie-buy/src/main/java/com/bwie/buy/service/BuyService.java
+++ b/bwie-models/bwie-buy/src/main/java/com/bwie/buy/service/BuyService.java
@ -0,0 +1,15 @@
+package com.bwie.buy.service;
+
+import com.bwie.common.pojo.VO.VOGoods;
+import com.bwie.common.result.Result;
+
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+public interface BuyService {
+    Result buyGood(VOGoods voGoods);
+
+    Result showGoodsList(VOGoods voGoods);
+}
--- a/bwie-models/bwie-buy/src/main/java/com/bwie/buy/service/impl/BuyServiceImp.java
+++ b/bwie-models/bwie-buy/src/main/java/com/bwie/buy/service/impl/BuyServiceImp.java
@ -0,0 +1,67 @@
+package com.bwie.buy.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.bwie.buy.dao.BuyDao;
+import com.bwie.buy.service.BuyService;
+import com.bwie.common.constants.JwtConstants;
+import com.bwie.common.pojo.DTO.DTOGoods;
+import com.bwie.common.pojo.DTO.DTOUser;
+import com.bwie.common.pojo.Sell;
+import com.bwie.common.pojo.Shop;
+import com.bwie.common.pojo.VO.VOGoods;
+import com.bwie.common.result.Result;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @author FangShiBa
+ * @date 2023/12/17
+ * @apiNote
+ */
+@Service
+public class BuyServiceImp implements BuyService {
+    @Autowired
+    private BuyDao dao;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
+    @Autowired
+    private HttpServletRequest request;
+
+    @Override
+    public Result buyGood(VOGoods voGoods) {
+        if(null==voGoods.getFacilityId()||null==voGoods.getPayForMoney()){
+            return Result.error("输入的值有误或未输入");
+        }
+        Shop shop=dao.findById(voGoods.getShopId());
+        if(shop.getShopPrice()>voGoods.getPayForMoney()){
+            return Result.error("小老弟,钱不够");
+        }
+
+        //voGoods 参数有商品编号和售货机编号
+        dao.buyGood(voGoods);
+        String token = request.getHeader("token");
+        String s = redisTemplate.opsForValue().get(JwtConstants.LOGIN_TOKEN + token);
+        DTOUser dtoUser = JSON.parseObject(s, DTOUser.class);
+        Sell sell = new Sell();
+        sell.setFacilityId(voGoods.getFacilityId());
+        sell.setShopId(voGoods.getShopId());
+        sell.setUserId(dtoUser.getUserId());
+        dao.addSell(sell);
+
+        return Result.success("购买成功");
+    }
+
+    @Override
+    public Result showGoodsList(VOGoods voGoods) {
+        PageHelper.startPage(voGoods.getPageNum(),voGoods.getPageSize());
+        List<DTOGoods> list=dao.showGoodsList(voGoods);
+        PageInfo<DTOGoods> info = new PageInfo<>(list);
+        return Result.success(info);
+    }
+}
--- a/bwie-models/bwie-buy/src/main/java/com/bwie/buy/util/FastUtil.java
+++ b/bwie-models/bwie-buy/src/main/java/com/bwie/buy/util/FastUtil.java
@ -0,0 +1,55 @@
+package com.bwie.buy.util;
+
+import org.springframework.stereotype.Component;
+import com.github.tobato.fastdfs.domain.fdfs.StorePath;
+import com.github.tobato.fastdfs.service.FastFileStorageClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+
+/**
+ * @BelongsProject: 0107day02
+ * @BelongsPackage: com.bw.config
+ * @Author: zhupengfei
+ * @CreateTime: 2023-02-01  08:52
+ */
+@Component
+public class FastUtil {
+    private static final Logger log = LoggerFactory.getLogger(FastUtil.class);
+
+    @Resource
+    private FastFileStorageClient storageClient ;
+
+    /**
+     * 上传文件
+     */
+    public String upload(MultipartFile multipartFile) throws Exception{
+        String originalFilename = multipartFile.getOriginalFilename().
+                substring(multipartFile.getOriginalFilename().
+                        lastIndexOf(".") + 1);
+        StorePath storePath = this.storageClient.uploadImageAndCrtThumbImage(
+                multipartFile.getInputStream(),
+                multipartFile.getSize(),originalFilename , null);
+        return storePath.getFullPath() ;
+    }
+    /**
+     * 删除文件
+     */
+    public String deleteFile(String fileUrl) {
+        if (StringUtils.isEmpty(fileUrl)) {
+            log.info("fileUrl == >>文件路径为空...");
+            return "文件路径不能为空";
+        }
+        try {
+            StorePath storePath = StorePath.parseFromUrl(fileUrl);
+            storageClient.deleteFile(storePath.getGroup(), storePath.getPath());
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        }
+        return "删除成功";
+    }
+
+}
--- a/bwie-models/bwie-buy/src/main/resources/bootstrap.yml
+++ b/bwie-models/bwie-buy/src/main/resources/bootstrap.yml
@ -0,0 +1,41 @@
+# Tomcat
+server:
+  port: 9004
+# Spring
+spring:
+  main:
+    allow-circular-references: true
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+  application:
+    # 应用名称
+    name: bwie-buy
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 110.42.214.8:8848
+      config:
+        # 配置中心地址
+        server-addr: 110.42.214.8:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+fdfs:
+  so-timeout: 1500 # socket 连接时长
+  connect-timeout: 600 # 连接 tracker 服务器超时时长
+  # 这两个是你服务器的 IP 地址，注意 23000 端口也要打开，阿里云服务器记得配置安全组。tracker 要和 stroage 服务进行交流
+  tracker-list: 110.42.214.8:22122
+  web-server-url: 110.42.214.8:8888
+  pool:
+    jmx-enabled: false
+  # 生成缩略图
+  thumb-image:
+    height: 500
+    width: 500
--- a/bwie-models/bwie-buy/src/main/resources/mapper/BuyMapper.xml
+++ b/bwie-models/bwie-buy/src/main/resources/mapper/BuyMapper.xml
@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bwie.buy.dao.BuyDao">
+    <insert id="addSell">
+        INSERT INTO `shop_manage`.`t_sell`
+        (`shop_id`, `sell_time`, `user_id`, `facility_id`) VALUES
+        (#{shopId},       now(), #{userId}, #{facilityId});
+
+    </insert>
+    <update id="buyGood">
+
+        UPDATE `shop_manage`.`t_goods` SET
+            `goods_num` = (`goods_num`-1)
+        WHERE
+            `shop_id` = #{shopId} and
+            `facility_id` = #{facilityId}
+    </update>
+
+    <select id="showGoodsList" resultType="com.bwie.common.pojo.DTO.DTOGoods">
+        select * from t_goods g
+                          left join t_shop s on g.shop_id=s.shop_id
+                          left join t_facility f on g.facility_id=f.facility_id
+        WHERE f.facility_id=#{facilityId}
+    </select>
+    <select id="findById" resultType="com.bwie.common.pojo.Shop">
+        select * from t_shop
+        where shop_id=${shopId}
+    </select>
+</mapper>
--- a/bwie-models/pom.xml
+++ b/bwie-models/pom.xml
@ -10,10 +10,6 @@
    </parent>

    <artifactId>bwie-models</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>bwie-shopList</module>
-    </modules>

    <properties>
        <maven.compiler.source>8</maven.compiler.source>
Author	SHA1	Message	Date
fangzhe	4aa014098e	Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/encodings.xml # bwie-common/src/main/java/com/bwie/common/pojo/DTO/DTOGoods.java # bwie-common/src/main/java/com/bwie/common/pojo/Facility.java # bwie-common/src/main/java/com/bwie/common/pojo/Goods.java # bwie-common/src/main/java/com/bwie/common/pojo/Shop.java # bwie-common/src/main/java/com/bwie/common/pojo/VO/VOGoods.java # bwie-models/pom.xml	2023-12-19 16:47:53 +08:00
fangzhe	72adb54ab7	Merge branch 'FangShiBa'	2023-12-19 15:01:18 +08:00
fangzhe	9234eb12b4	售货机商品列表及购买功能(完善)	2023-12-18 21:05:54 +08:00
fangzhe	9f40ad6a5e	售货机商品列表及购买功能	2023-12-17 16:23:48 +08:00
fangzhe	08420bb7e1	售货机商品列表及购买功能	2023-12-17 15:10:05 +08:00