fixed 【称重功能】购物车数量、商品库存等支持小数功能开发迭代

fuint-application/src/main/java/com/fuint/common/dto/GoodsDetailDto.java

@@ -48,13 +48,13 @@ public class GoodsDetailDto implements Serializable {
     private BigDecimal linePrice;
 
     @ApiModelProperty("库存")
-    private Integer stock;
+    private Double stock;
 
     @ApiModelProperty("商品重量")
     private BigDecimal weight;
 
     @ApiModelProperty("初始销量")
-    private Integer initSale;
+    private Double initSale;
 
     @ApiModelProperty("商品卖点")
     private String salePoint;

fuint-application/src/main/java/com/fuint/common/dto/GoodsDto.java

@@ -64,7 +64,7 @@ public class GoodsDto implements Serializable {
     private BigDecimal linePrice;
 
     @ApiModelProperty("库存")
-    private Integer stock;
+    private Double stock;
 
     @ApiModelProperty("数量")
     private Integer num;
@@ -79,7 +79,7 @@ public class GoodsDto implements Serializable {
     private BigDecimal weight;
 
     @ApiModelProperty("初始销量")
-    private Integer initSale;
+    private Double initSale;
 
     @ApiModelProperty("商品卖点")
     private String salePoint;

fuint-application/src/main/java/com/fuint/common/dto/GoodsSkuDto.java

@@ -38,7 +38,7 @@ public class GoodsSkuDto implements Serializable {
     private List<MtGoodsSpec> specList;
 
     @ApiModelProperty("库存")
-    private Integer stock;
+    private Double stock;
 
     @ApiModelProperty("价格")
     private BigDecimal price;

fuint-application/src/main/java/com/fuint/common/dto/OrderDto.java

@@ -52,7 +52,7 @@ public class OrderDto implements Serializable {
     private Integer skuId;
 
     @ApiModelProperty("购买数量")
-    private Integer buyNum;
+    private Double buyNum;
 
     @ApiModelProperty("会员ID")
     private Integer userId;

fuint-application/src/main/java/com/fuint/common/dto/OrderGoodsDto.java

@@ -36,7 +36,7 @@ public class OrderGoodsDto implements Serializable {
     private String discount;
 
     @ApiModelProperty("购买数量")
-    private Integer num;
+    private Double num;
 
     @ApiModelProperty("图片")
     private String image;

fuint-application/src/main/java/com/fuint/common/dto/ResCartDto.java

@@ -31,7 +31,7 @@ public class ResCartDto implements Serializable {
     private Integer skuId;
 
     @ApiModelProperty("数量")
-    private Integer num;
+    private Double num;
 
     @ApiModelProperty("是否有效")
     private Boolean isEffect;

fuint-application/src/main/java/com/fuint/common/param/CartListParam.java

@@ -31,7 +31,7 @@ public class CartListParam extends PageParam implements Serializable {
     private String point;
 
     @ApiModelProperty(value="购买数量", name="buyNum")
-    private Integer buyNum;
+    private Double buyNum;
 
     @ApiModelProperty(value="挂单编码", name="hangNo")
     private String hangNo;

fuint-application/src/main/java/com/fuint/common/param/CartSaveParam.java

@@ -25,7 +25,7 @@ public class CartSaveParam implements Serializable {
     private String skuNo;
 
     @ApiModelProperty(value="购买数量", name="buyNum")
-    private Integer buyNum;
+    private Double buyNum;
 
     @ApiModelProperty(value="操作类型，+：增加，-：减少", name="action")
     private String action;

fuint-application/src/main/java/com/fuint/common/param/SettlementParam.java

@@ -61,7 +61,7 @@ public class SettlementParam implements Serializable {
     private Integer skuId;
 
     @ApiModelProperty(value="购买数量", name="buyNum")
-    private Integer buyNum;
+    private Double buyNum;
 
     @ApiModelProperty(value="订单模式，配送（express）或自提（oneself）", name="orderMode")
     private String orderMode;

fuint-application/src/main/java/com/fuint/common/service/GoodsService.java

@@ -125,7 +125,7 @@ public interface GoodsService {
      * @param saleNum 销售数量
      * @return
      * */
-    Boolean updateInitSale(Integer goodsId, Integer saleNum);
+    Boolean updateInitSale(Integer goodsId, Double saleNum);
 
     /**
      * 获取选择商品列表

fuint-application/src/main/java/com/fuint/common/service/UserCouponService.java

@@ -104,7 +104,7 @@ public interface UserCouponService extends IService<MtUserCoupon> {
      * @param num 购买数量
      * @return
      * */
-    boolean buyCouponItem(Integer orderId, Integer couponId, Integer userId, String mobile, Integer num) throws BusinessCheckException;
+    boolean buyCouponItem(Integer orderId, Integer couponId, Integer userId, String mobile, Double num) throws BusinessCheckException;
 
     /**
      * 通过卡券ID删除会员卡券

fuint-application/src/main/java/com/fuint/common/service/impl/CartServiceImpl.java

@@ -98,12 +98,12 @@ public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implement
                 param.put("SKU_ID", reqDto.getSkuId());
             }
             List<MtCart> cartList = mtCartMapper.selectByMap(param);
-            Integer cartNum = 0;
+            Double cartNum = 0.0;
             if (cartList != null && cartList.size() > 0) {
                 cartNum = cartList.get(0).getNum();
             }
             // 剩余库存数量
-            Integer totalStock = 0;
+            Double totalStock = 0.0;
             if (reqDto.getSkuId() != null && reqDto.getSkuId() > 0) {
                 MtGoodsSku mtGoodsSku = mtGoodsSkuMapper.selectById(reqDto.getSkuId());
                 if (mtGoodsSku != null && mtGoodsSku.getStock() != null) {
@@ -179,7 +179,7 @@ public class CartServiceImpl extends ServiceImpl<MtCartMapper, MtCart> implement
             } else if (action.equals("=")) {
                 mtCart.setNum(reqDto.getNum());
             } else {
-                Integer num = mtCart.getNum() - 1;
+                Double num = mtCart.getNum() - 1;
                 if (num <= 0) {
                     this.removeCart(mtCart.getId()+"");
                     return mtCart.getId();

fuint-application/src/main/java/com/fuint/common/service/impl/GoodsServiceImpl.java

@@ -554,13 +554,13 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
             if (goodsSkuList.size() > 0) {
                 goodsInfo.setPrice(goodsSkuList.get(0).getPrice());
                 goodsInfo.setLinePrice(goodsSkuList.get(0).getLinePrice());
-                Integer stock = 0;
+                Double stock = 0.0;
                 for (MtGoodsSku mtGoodsSku : goodsSkuList) {
                      stock = stock + mtGoodsSku.getStock();
                 }
                 goodsInfo.setStock(stock);
             } else {
-                goodsInfo.setStock(0);
+                goodsInfo.setStock(0.0);
             }
         } else {
             goodsInfo.setSkuList(new ArrayList<>());
@@ -623,13 +623,13 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
                     if (goodsSkuList.size() > 0) {
                         mtGoods.setPrice(goodsSkuList.get(0).getPrice());
                         mtGoods.setLinePrice(goodsSkuList.get(0).getLinePrice());
-                        Integer stock = 0;
+                        Double stock = 0.0;
                         for (MtGoodsSku mtGoodsSku : goodsSkuList) {
                              stock = stock + mtGoodsSku.getStock();
                         }
                         mtGoods.setStock(stock);
                     } else {
-                        mtGoods.setStock(0);
+                        mtGoods.setStock(0.0);
                     }
                 }
                 dataList.add(mtGoods);
@@ -695,7 +695,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
      * */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Boolean updateInitSale(Integer goodsId, Integer saleNum) {
+    public Boolean updateInitSale(Integer goodsId, Double saleNum) {
         return mtGoodsMapper.updateInitSale(goodsId, saleNum);
     }
 
@@ -928,12 +928,12 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
                  } else {
                      mtGoods.setIsSingleSpec(YesOrNoEnum.NO.getKey());
                  }
-                 mtGoods.setInitSale(Integer.parseInt(goods.get(10)));
+                 mtGoods.setInitSale(Double.parseDouble(goods.get(10)));
                  mtGoods.setSalePoint(goods.get(11));
                  mtGoods.setDescription(goods.get(12));
                  mtGoods.setPrice(new BigDecimal("0"));
                  mtGoods.setLinePrice(new BigDecimal("0"));
-                 mtGoods.setStock(0);
+                 mtGoods.setStock(0.0);
                  mtGoods.setStatus(StatusEnum.FORBIDDEN.getKey());
                  saveGoods(mtGoods, storeIds);
             }
@@ -955,7 +955,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
                      if (mtGoods.getIsSingleSpec().equals(YesOrNoEnum.YES.getKey())) {
                          mtGoods.setPrice(new BigDecimal(sku.get(4)));
                          mtGoods.setLinePrice(new BigDecimal(sku.get(5)));
-                         mtGoods.setStock(Integer.parseInt(sku.get(6)));
+                         mtGoods.setStock(Double.parseDouble(sku.get(6)));
                          mtGoods.setWeight(new BigDecimal(sku.get(7)));
                          mtGoodsMapper.updateById(mtGoods);
                      }
@@ -979,7 +979,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
                              mtGoodsSku.setSpecIds(String.join("-", specIds));
                              mtGoodsSku.setPrice(new BigDecimal(sku.get(4)));
                              mtGoodsSku.setLinePrice(new BigDecimal(sku.get(5)));
-                             mtGoodsSku.setStock(Integer.parseInt(sku.get(6)));
+                             mtGoodsSku.setStock(Double.parseDouble(sku.get(6)));
                              mtGoodsSku.setWeight(new BigDecimal(sku.get(7)));
                              mtGoodsSku.setStatus(StatusEnum.ENABLED.getKey());
                              mtGoodsSkuMapper.insert(mtGoodsSku);

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -577,7 +577,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                  MtGoods goodsInfo = mtGoodsMapper.selectById(cart.getGoodsId());
                  if (goodsInfo.getIsSingleSpec().equals(YesOrNoEnum.YES.getKey())) {
                      // 单规格减去库存
-                     Integer stock = goodsInfo.getStock() - cart.getNum();
+                     Double stock = goodsInfo.getStock() - cart.getNum();
                      if (stock < 0) {
                          throw new BusinessCheckException("商品“" + goodsInfo.getName() + "”库存不足，订单提交失败");
                      }
@@ -587,7 +587,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                      // 多规格减去库存
                      MtGoodsSku mtGoodsSku = mtGoodsSkuMapper.selectById(cart.getSkuId());
                      if (mtGoodsSku != null) {
-                         Integer stock = mtGoodsSku.getStock() - cart.getNum();
+                         Double stock = mtGoodsSku.getStock() - cart.getNum();
                          if (stock < 0) {
                              throw new BusinessCheckException("商品sku编码“" + mtGoodsSku.getSkuNo() +"”库存不足，订单提交失败");
                          }
@@ -595,7 +595,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                          mtGoodsSkuMapper.updateById(mtGoodsSku);
 
                          if (goodsInfo.getStock() != null && goodsInfo.getStock() > 0) {
-                             Integer goodsStock = goodsInfo.getStock() - cart.getNum();
+                             Double goodsStock = goodsInfo.getStock() - cart.getNum();
                              if (goodsStock >= 0) {
                                  goodsInfo.setStock(goodsStock);
                                  mtGoodsMapper.updateById(goodsInfo);
@@ -680,7 +680,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         String cashierDiscountAmount = param.getCashierDiscountAmount() == null ? "" : param.getCashierDiscountAmount(); // 收银台优惠金额
         Integer goodsId = param.getGoodsId() == null ? 0 : param.getGoodsId(); // 立即购买商品ID
         Integer skuId = param.getSkuId() == null ? 0 : param.getSkuId(); // 立即购买商品skuId
-        Integer buyNum = param.getBuyNum() == null ? 1 : param.getBuyNum(); // 立即购买商品数量
+        Double buyNum = param.getBuyNum() == null ? 1.0 : param.getBuyNum(); // 立即购买商品数量
         String orderMode = StringUtil.isEmpty(param.getOrderMode()) ? OrderModeEnum.ONESELF.getKey() : param.getOrderMode(); // 订单模式(配送or自取)
         Integer orderId = param.getOrderId() == null ? null : param.getOrderId(); // 订单ID
         Integer merchantId = merchantService.getMerchantId(merchantNo);
@@ -1698,7 +1698,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                         goodsDto.setId(coupon.getId());
                         goodsDto.setType(OrderTypeEnum.PRESTORE.getKey());
                         goodsDto.setName("预存￥" + item[0] + "到账￥" + item[1]);
-                        goodsDto.setNum(Integer.parseInt(item[2]));
+                        goodsDto.setNum(Double.parseDouble(item[2]));
                         goodsDto.setPrice(item[0]);
                         goodsDto.setDiscount("0");
                         if (coupon.getImage().indexOf(baseImage) == -1) {
@@ -1955,7 +1955,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
 
         List<ResCartDto> cartDtoList = new ArrayList<>();
         String basePath = settingService.getUploadBasePath();
-        Integer totalNum = 0;
+        Double totalNum = 0.0;
         BigDecimal totalPrice = new BigDecimal("0");
         BigDecimal totalCanUsePointAmount = new BigDecimal("0");
         BigDecimal memberDiscount = new BigDecimal("0");

fuint-application/src/main/java/com/fuint/common/service/impl/StockServiceImpl.java

@@ -134,7 +134,7 @@ public class StockServiceImpl extends ServiceImpl<MtStockMapper, MtStock> implem
             MtGoods goodsInfo = mtGoodsMapper.selectById(goodsId);
             if (goodsInfo.getIsSingleSpec().equals(YesOrNoEnum.YES.getKey())) {
                 // 单规格库存
-                Integer stock;
+                Double stock;
                 if (mtStock.getType().equals("increase")) {
                     stock = goodsInfo.getStock() + num;
                 } else {
@@ -149,7 +149,7 @@ public class StockServiceImpl extends ServiceImpl<MtStockMapper, MtStock> implem
                 // 多规格库存
                 MtGoodsSku mtGoodsSku = mtGoodsSkuMapper.selectById(skuId);
                 if (mtGoodsSku != null) {
-                    Integer stock;
+                    Double stock;
                     if (mtStock.getType().equals("increase")) {
                         stock = mtGoodsSku.getStock() + num;
                     } else {

fuint-application/src/main/java/com/fuint/common/service/impl/UserCouponServiceImpl.java

@@ -642,9 +642,9 @@ public class UserCouponServiceImpl extends ServiceImpl<MtUserCouponMapper, MtUse
      * */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean buyCouponItem(Integer orderId, Integer couponId, Integer userId, String mobile, Integer num) throws BusinessCheckException {
+    public boolean buyCouponItem(Integer orderId, Integer couponId, Integer userId, String mobile, Double num) throws BusinessCheckException {
         if (num == null || num <= 0) {
-            num = 1;
+            num = 1.0;
         }
         for (int j = 0; j < num; j++) {
             MtCoupon couponInfo = couponService.queryCouponById(couponId);

fuint-application/src/main/java/com/fuint/common/util/NoteFormatter.java

@@ -167,7 +167,7 @@ public class NoteFormatter {
      * @param price    价格
      * @throws Exception
      */
-    public static String formatPrintOrderItemForNewLine80(String foodName, Integer quantity, Double price) throws Exception {
+    public static String formatPrintOrderItemForNewLine80(String foodName, Double quantity, Double price) throws Exception {
         StringBuilder builder = new StringBuilder();
         byte[] itemNames = foodName.getBytes("GBK");
         Integer mod = itemNames.length % ROW_MAX_CHAR_LEN80;
@@ -211,7 +211,7 @@ public class NoteFormatter {
         }
     }
 
-    private static void getFoodNameSplit80(String foodName, StringBuilder builder, Integer quantity, Double price) throws UnsupportedEncodingException {
+    private static void getFoodNameSplit80(String foodName, StringBuilder builder, Double quantity, Double price) throws UnsupportedEncodingException {
         String[] foodNames = string2StringArray(foodName, LAST_ROW_MAX_NAME_CHAR_LEN80);
         String quanityStr = quantity.toString();
         byte[] itemQuans = quanityStr.getBytes("GBK");

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendFileController.java

@@ -173,6 +173,7 @@ public class BackendFileController extends BaseController {
         try {
             URL resourceUrl = getClass().getClassLoader().getResource("GoodsTemplate.xlsx");
             String path = resourceUrl.getPath();
+            logger.info("下载文件路径：path = {}", path);
             File file = new File(path);
             String filename = file.getName();
             InputStream fis = new BufferedInputStream(new FileInputStream(path));
@@ -189,7 +190,7 @@ public class BackendFileController extends BaseController {
             toClient.close();
         } catch (IOException ex) {
             ex.printStackTrace();
-            logger.error("下载文件出错：account = {}", accountInfo.getAccountName());
+            logger.error("下载文件出错：account = {}，message = {}", accountInfo.getAccountName(), ex.getMessage());
         }
     }
 

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendGoodsController.java

@@ -314,7 +314,7 @@ public class BackendGoodsController extends BaseController {
         String price = param.get("price") == null ? "" : param.get("price").toString();
         String linePrice = param.get("linePrice") == null ? "" : param.get("linePrice").toString();
         String weight = param.get("weight") == null ? "" : param.get("weight").toString();
-        Integer initSale = param.get("initSale") == null ? 0 : Integer.parseInt(param.get("initSale").toString());
+        Double initSale = param.get("initSale") == null ? 0 : Double.parseDouble(param.get("initSale").toString());
         String salePoint = param.get("salePoint") == null ? "" : param.get("salePoint").toString();
         String canUsePoint = param.get("canUsePoint") == null ? "" : param.get("canUsePoint").toString();
         String isMemberDiscount = param.get("isMemberDiscount") == null ? "" : param.get("isMemberDiscount").toString();
@@ -395,7 +395,7 @@ public class BackendGoodsController extends BaseController {
             if (StringUtil.isEmpty(skuStock)) {
                 skuStock = "0";
             }
-            sku.setStock(Integer.parseInt(skuStock));
+            sku.setStock(Double.parseDouble(skuStock));
 
             BigDecimal skuPrice = new BigDecimal("0");
             if (skuDto.get("price") != null && StringUtil.isNotEmpty(skuDto.get("price").toString())) {
@@ -456,7 +456,7 @@ public class BackendGoodsController extends BaseController {
         }
         mtGoods.setIsSingleSpec(isSingleSpec);
         if (StringUtil.isNotEmpty(stock)) {
-            mtGoods.setStock(Integer.parseInt(stock));
+            mtGoods.setStock(Double.parseDouble(stock));
         }
         if (StringUtil.isNotEmpty(description)) {
             mtGoods.setDescription(description);

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -81,7 +81,7 @@ public class ClientCartController extends BaseController {
         Integer goodsId = saveParam.getGoodsId() == null ? 0 : saveParam.getGoodsId();
         Integer skuId = saveParam.getSkuId() == null ? 0 : saveParam.getSkuId();
         String skuNo = saveParam.getSkuNo() == null ? "" : saveParam.getSkuNo();
-        Integer buyNum = saveParam.getBuyNum() == null ? 1 : saveParam.getBuyNum();
+        Double buyNum = saveParam.getBuyNum() == null ? 1 : saveParam.getBuyNum();
         String action = saveParam.getAction() == null ? "+" : saveParam.getAction();
         String hangNo = saveParam.getHangNo() == null ? "" : saveParam.getHangNo();
         Integer userId = saveParam.getUserId() == null ? 0 : saveParam.getUserId(); // 指定会员ID
@@ -207,7 +207,7 @@ public class ClientCartController extends BaseController {
         String platform = request.getHeader("platform") == null ? "" : request.getHeader("platform");
         Integer goodsId = params.getGoodsId() == null ? 0 : params.getGoodsId();
         Integer skuId = params.getSkuId() == null ? 0 : params.getSkuId();
-        Integer buyNum = params.getBuyNum() == null ? 1 : params.getBuyNum();
+        Double buyNum = params.getBuyNum() == null ? 1 : params.getBuyNum();
         String cartIds = params.getCartIds() == null ? "" : params.getCartIds();
         Integer userCouponId = params.getCouponId() == null ? 0 : params.getCouponId();// 会员卡券ID
         Integer userId = params.getUserId() == null ? 0 : params.getUserId(); // 会员ID

fuint-repository/src/main/java/com/fuint/repository/bean/GoodsBean.java

@@ -42,7 +42,7 @@ public class GoodsBean implements Serializable {
     private BigDecimal price;
 
     @ApiModelProperty("商品库存")
-    private Integer stock;
+    private Double stock;
 
     @ApiModelProperty("商品规格")
     private String specIds;

fuint-repository/src/main/java/com/fuint/repository/mapper/MtGoodsMapper.java

@@ -25,7 +25,7 @@ public interface MtGoodsMapper extends BaseMapper<MtGoods> {
 
     List<MtGoods> getByGoodsName(@Param("merchantId") Integer merchantId, @Param("goodsName") String goodsName);
 
-    Boolean updateInitSale(@Param("goodsId") Integer goodsId, @Param("saleNum") Integer saleNum);
+    Boolean updateInitSale(@Param("goodsId") Integer goodsId, @Param("saleNum") Double saleNum);
 
     List<GoodsBean> selectGoodsList(@Param("merchantId") Integer merchantId, @Param("storeId") Integer storeId, @Param("cateId") Integer cateId, @Param("keyword") String keyword);
 

fuint-repository/src/main/java/com/fuint/repository/model/MtCart.java

@@ -7,8 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
 
 /**
  * 购物车
@@ -16,8 +15,7 @@ import lombok.Setter;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-@Getter
-@Setter
+@Data
 @TableName("mt_cart")
 @ApiModel(value = "MtCart对象", description = "购物车对象")
 public class MtCart implements Serializable {
@@ -50,7 +48,7 @@ public class MtCart implements Serializable {
     private Integer goodsId;
 
     @ApiModelProperty("数量")
-    private Integer num;
+    private Double num;
 
     @ApiModelProperty("创建时间")
     private Date createTime;

fuint-repository/src/main/java/com/fuint/repository/model/MtGoods.java

@@ -63,7 +63,7 @@ public class MtGoods implements Serializable {
     private BigDecimal linePrice;
 
     @ApiModelProperty("库存")
-    private Integer stock;
+    private Double stock;
 
     @ApiModelProperty("关联卡券")
     private String couponIds;
@@ -75,7 +75,7 @@ public class MtGoods implements Serializable {
     private BigDecimal weight;
 
     @ApiModelProperty("初始销量")
-    private Integer initSale;
+    private Double initSale;
 
     @ApiModelProperty("商品卖点")
     private String salePoint;

fuint-repository/src/main/java/com/fuint/repository/model/MtGoodsSku.java

@@ -41,7 +41,7 @@ public class MtGoodsSku implements Serializable {
     private String specIds;
 
     @ApiModelProperty("库存")
-    private Integer stock;
+    private Double stock;
 
     @ApiModelProperty("价格")
     private BigDecimal price;

fuint-repository/src/main/java/com/fuint/repository/model/MtOrderGoods.java

@@ -12,9 +12,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * <p>
  * 订单商品表
- * </p>
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
@@ -47,7 +45,7 @@ public class MtOrderGoods implements Serializable {
     private BigDecimal discount;
 
     @ApiModelProperty("商品数量")
-    private Integer num;
+    private Double num;
 
     @ApiModelProperty("创建时间")
     private Date createTime;