+
+
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
-
-
-
- {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
-
-
-
-
+
+
+
+
+
+
+
新增
+
+
+
+ 修改
- 删除
-
-
-
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['system:exchange:edit']"
+ >修改
+
+
+
-
+
+
+
+
+
+ 在线
+ 下线
+
+
+
+
+ 启用
+ 禁用
+
+
+
+
+
+ 兑换券
+ 洗车券
+ 洗车卡
+
+
+
+
+ {{scope.row.validity}}天
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
+
+
+
+
+ 修改
+
+ 下线
+
+ 上线
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+ 兑换券
+ 洗车券
+ 洗车卡
+
-
-
+ 天
+
-
-
-
-
-
-
-
+
+
+ 启用
+ 禁用
+
+
+
+
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
index 33d4e6846..88952fcdd 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue
@@ -1,231 +1,113 @@
-
+
+
+
+
+
+
+
@@ -109,16 +149,26 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
搜索
- 重置
+
+
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导出
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
-
-
-
-
- {{ parseTime(scope.row.cancelTime, '{y}-{m}-{d}') }}
-
-
+
+
+
+
+
+
+
{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}
-
+
- {{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}
+ {{ parseTime(scope.row.outTime, '{y}-{m}-{d}') }}
-
-
- 修改
- 删除
-
+
+
+ 未使用
+ 已使用
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -315,7 +197,7 @@
+
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 64dfe2e25..91d9e1146 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -3,8 +3,6 @@
goods = goodsService.selectGoodsList();
+ return getSuccessResult(goods);
+ }
+
/**
* 根据id查询商品信息
* @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java
index 7d5fc41cd..d79db80ee 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java
@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.fuint.business.convenienceSore.entity.LJGoods;
+import java.util.List;
+
/**
* 商品信息 业务层
*/
@@ -17,6 +19,12 @@ public interface LJGoodsService extends IService {
*/
public IPage selectLJGoodsList(Page page, LJGoods goods);
+ /**
+ * 查询所有商品列表信息
+ * @return
+ */
+ public List selectGoodsList();
+
/**
* 根据id查询商品信息
* @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
index 45add8f9c..f89419b81 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
@@ -18,6 +18,7 @@ import com.fuint.common.util.TokenUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
import java.util.Random;
/**
@@ -44,6 +45,17 @@ public class LJGoodsServiceImpl extends ServiceImpl impl
return goodsIPage;
}
+ @Override
+ public List selectGoodsList() {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ Integer storeId = nowAccountInfo.getStoreId();
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_recovery",0);
+ queryWrapper.eq("store_id",storeId);
+ List list = baseMapper.selectList(queryWrapper);
+ return list;
+ }
+
/**
* 根据id查询商品信息
* @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
index de71c07e2..1b25f7c6b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
@@ -88,5 +88,17 @@ public class IntegralGiftController extends BaseController {
return getSuccessResult(this.integralGiftService.deleteById(id));
}
+ /**
+ * 单独修改商品的库存
+ * @param id
+ * @param editInventory
+ * @return
+ */
+ @GetMapping("updateInventory")
+ public ResponseObject updateInventory(@Param("id") Integer id,@Param("editInventory") Integer editInventory) {
+ return getSuccessResult(this.integralGiftService.updateInventory(id,editInventory));
+ }
+
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
new file mode 100644
index 000000000..aca5c0f61
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
@@ -0,0 +1,99 @@
+package com.fuint.business.integral.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.integral.entity.IntegralOrders;
+import com.fuint.business.integral.service.IntegralOrdersService;
+import com.fuint.business.integral.vo.IntegralOrdersVO;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 存储兑换订单信息(IntegralOrders)表控制层
+ *
+ * @author makejava
+ * @since 2023-11-07 13:59:23
+ */
+@RestController
+@RequestMapping("business/integral/integralOrders")
+public class IntegralOrdersController extends BaseController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private IntegralOrdersService integralOrdersService;
+
+ /**
+ * 分页查询
+ *
+ * @param integralOrders 筛选条件
+ * @param pageNo 分页对象
+ * @return 查询结果
+ */
+ @GetMapping("queryByPage")
+ public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+ @Param("integralOrders") IntegralOrders integralOrders) {
+ Page page = new Page(pageNo, pageSize);
+ IPage integralOrdersIPage = this.integralOrdersService.queryByPage(page, integralOrders);
+ return getSuccessResult(integralOrdersIPage);
+ }
+
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public ResponseObject queryById(@PathVariable("id") Integer id) {
+ return getSuccessResult(this.integralOrdersService.queryById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param integralOrders 实体
+ * @return 新增结果
+ */
+ @PostMapping
+ public ResponseObject add(IntegralOrders integralOrders) {
+ return getSuccessResult(this.integralOrdersService.insert(integralOrders));
+ }
+
+ /**
+ * 编辑数据
+ *
+ * @param integralOrders 实体
+ * @return 编辑结果
+ */
+ @PutMapping
+ public ResponseObject edit(IntegralOrders integralOrders) {
+ return getSuccessResult(this.integralOrdersService.update(integralOrders));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param id 主键
+ * @return 删除是否成功
+ */
+ @DeleteMapping
+ public ResponseObject deleteById(Integer id) {
+ return getSuccessResult(this.integralOrdersService.deleteById(id));
+ }
+
+
+ @GetMapping("/statistics")
+ public ResponseObject statistics() {
+ return getSuccessResult(this.integralOrdersService.statistics());
+ }
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGift.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGift.java
index 5ab37fdfd..defaceda4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGift.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGift.java
@@ -63,6 +63,8 @@ public class IntegralGift extends BaseEntity {
* 礼品剩余库存
*/
private Integer remainingInventory;
+
+ private Integer usedInventory;
/**
* 商家卡券
*/
@@ -79,6 +81,10 @@ public class IntegralGift extends BaseEntity {
* 加钱比例
*/
private Double moneyRatio;
+ /**
+ * 市场价格
+ */
+ private Double market;
/**
* 兑换金额
*/
@@ -94,7 +100,7 @@ public class IntegralGift extends BaseEntity {
/**
* 快递运费
*/
- private Double expressShippingFee;
+ private String expressShippingFee;
/**
* 运费金额
*/
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java
new file mode 100644
index 000000000..7c910d7a1
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralOrders.java
@@ -0,0 +1,84 @@
+package com.fuint.business.integral.entity;
+
+import com.fuint.framework.entity.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 存储兑换订单信息(IntegralOrders)实体类
+ *
+ * @author makejava
+ * @since 2023-11-07 13:59:23
+ */
+@Data
+public class IntegralOrders extends BaseEntity {
+ private static final long serialVersionUID = 181605029480746026L;
+ /**
+ * 兑换订单id（主键）
+ */
+ private Integer id;
+ /**
+ * 关联用户id
+ */
+ private Integer userId;
+ /**
+ * 订单号
+ */
+ private String orderNumber;
+ /**
+ * 关联商品id
+ */
+ private Integer giftId;
+ /**
+ * 配送类型
+ */
+ private String shippingType;
+ /**
+ * 实付信息
+ */
+ private Double paidInfo;
+ /**
+ * 金额
+ */
+ private Double amount;
+ /**
+ * 积分
+ */
+ private Double integral;
+ /**
+ * 加油金
+ */
+ private Double comeOn;
+ /**
+ * 兑换数量
+ */
+ private Integer exchangeQuantity;
+ /**
+ * 订单状态
+ */
+ private String orderStatus;
+ /**
+ * 状态
+ */
+ private String status;
+ /**
+ * 订单类型
+ */
+ private String orderType;
+ /**
+ * 处理结果
+ */
+ private String processingResult;
+ /**
+ * 备注
+ */
+ private String notes;
+ /**
+ * 店铺ID
+ */
+ private Integer storeId;
+
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralGiftMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralGiftMapper.java
index 36b0aaa52..761c2a206 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralGiftMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralGiftMapper.java
@@ -83,5 +83,8 @@ public interface IntegralGiftMapper {
*/
int deleteById(Integer id);
+
+ int updateInventory(@Param("id") Integer id,@Param("editInventory") Integer editInventory,@Param("updateBy") Integer updateBy);
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
new file mode 100644
index 000000000..72a808722
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
@@ -0,0 +1,95 @@
+package com.fuint.business.integral.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.integral.entity.IntegralGift;
+import com.fuint.business.integral.entity.IntegralOrders;
+import com.fuint.business.integral.vo.IntegralGiftVO;
+import com.fuint.business.integral.vo.IntegralOrdersVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 存储兑换订单信息(IntegralOrders)表数据库访问层
+ *
+ * @author makejava
+ * @since 2023-11-07 13:59:23
+ */
+public interface IntegralOrdersMapper {
+
+ /**
+ * 通过ID查询单条数据
+ *
+ * @param id 主键
+ * @return 实例对象
+ */
+ IntegralOrders queryById(Integer id);
+
+ /**
+ * 查询指定行数据
+ *
+ * @param integralOrders 查询条件
+ * @param page 分页对象
+ * @return 对象列表
+ */
+ IPage queryAllByLimit(@Param("page") Page page, @Param("integralOrders") IntegralOrders integralOrders);
+
+ /**
+ * 统计总行数
+ *
+ * @param integralOrders 查询条件
+ * @return 总行数
+ */
+ long count(IntegralOrders integralOrders);
+
+ /**
+ * 新增数据
+ *
+ * @param integralOrders 实例对象
+ * @return 影响行数
+ */
+ int insert(IntegralOrders integralOrders);
+
+ /**
+ * 批量新增数据（MyBatis原生foreach方法）
+ *
+ * @param entities List 实例对象列表
+ * @return 影响行数
+ */
+ int insertBatch(@Param("entities") List entities);
+
+ /**
+ * 批量新增或按主键更新数据（MyBatis原生foreach方法）
+ *
+ * @param entities List 实例对象列表
+ * @return 影响行数
+ * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常，请自行校验入参
+ */
+ int insertOrUpdateBatch(@Param("entities") List entities);
+
+ /**
+ * 修改数据
+ *
+ * @param integralOrders 实例对象
+ * @return 影响行数
+ */
+ int update(IntegralOrders integralOrders);
+
+ /**
+ * 通过主键删除数据
+ *
+ * @param id 主键
+ * @return 影响行数
+ */
+ int deleteById(Integer id);
+
+ /**
+ * 统计数据
+ * @return
+ */
+ Map statistics();
+
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml
index c85909df4..232ce7373 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftMapper.xml
@@ -33,6 +33,8 @@
- insert into integral_gift(gift_name, category_id, cover_image, gift_images, gift_type, coupon_id, voucher_id, goods_id, gift_quantity, total_inventory, remaining_inventory, merchant_coupon_id, exchange_method, exchange_points, money_ratio, exchange_amount, exchange_fuel_amount, delivery_method, express_shipping_fee, shipping_fee_amount, exchange_times, sort, status, detailed_description, store_id, create_time, update_time, create_by, update_by)
- values (#{giftName}, #{categoryId}, #{coverImage}, #{giftImages}, #{giftType}, #{couponId}, #{voucherId}, #{goodsId}, #{giftQuantity}, #{totalInventory}, #{remainingInventory}, #{merchantCouponId}, #{exchangeMethod}, #{exchangePoints}, #{moneyRatio}, #{exchangeAmount}, #{exchangeFuelAmount}, #{deliveryMethod}, #{expressShippingFee}, #{shippingFeeAmount}, #{exchangeTimes}, #{sort}, #{status}, #{detailedDescription}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy})
+ insert into integral_gift(gift_name, category_id, cover_image, gift_images, gift_type, coupon_id, voucher_id, goods_id, gift_quantity, total_inventory, remaining_inventory, merchant_coupon_id, exchange_method, exchange_points, money_ratio, exchange_amount, exchange_fuel_amount, delivery_method, express_shipping_fee, shipping_fee_amount, exchange_times, sort, status, detailed_description, store_id, create_time, update_time, create_by, update_by,market)
+ values (#{giftName}, #{categoryId}, #{coverImage}, #{giftImages}, #{giftType}, #{couponId}, #{voucherId}, #{goodsId}, #{giftQuantity}, #{totalInventory}, #{remainingInventory}, #{merchantCouponId}, #{exchangeMethod}, #{exchangePoints}, #{moneyRatio}, #{exchangeAmount}, #{exchangeFuelAmount}, #{deliveryMethod}, #{expressShippingFee}, #{shippingFeeAmount}, #{exchangeTimes}, #{sort}, #{status}, #{detailedDescription}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{market})
@@ -380,6 +383,9 @@
update_by = #{updateBy},
+
+ market = #{market},
+
where id = #{id}
@@ -389,5 +395,14 @@
delete from integral_gift where id = #{id}
+
+ update integral_gift
+ set
+ total_inventory = total_inventory + #{editInventory},
+ update_by = #{updateBy},
+ update_time = NOW()
+ where id =#{id}
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
new file mode 100644
index 000000000..31e9e723b
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
@@ -0,0 +1,301 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ insert into integral_orders(user_id, order_number, gift_id, shipping_type, paid_info, amount, integral, come_on, exchange_quantity, order_status, status, order_type, processing_result, notes, store_id, create_time, update_time, create_by, update_by)
+ values (#{userId}, #{orderNumber}, #{giftId}, #{shippingType}, #{paidInfo}, #{amount}, #{integral}, #{comeOn}, #{exchangeQuantity}, #{orderStatus}, #{status}, #{orderType}, #{processingResult}, #{notes}, #{storeId}, #{createTime}, #{updateTime}, #{createBy}, #{updateBy})
+
+
+
+ insert into integral_orders(user_id, order_number, gift_id, shipping_type, paid_info, amount, integral, come_on, exchange_quantity, order_status, status, order_type, processing_result, notes, store_id, create_time, update_time, create_by, update_by)
+ values
+
+ (#{entity.userId}, #{entity.orderNumber}, #{entity.giftId}, #{entity.shippingType}, #{entity.paidInfo}, #{entity.amount}, #{entity.integral}, #{entity.comeOn}, #{entity.exchangeQuantity}, #{entity.orderStatus}, #{entity.status}, #{entity.orderType}, #{entity.processingResult}, #{entity.notes}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
+
+
+
+
+ insert into integral_orders(user_id, order_number, gift_id, shipping_type, paid_info, amount, integral, come_on, exchange_quantity, order_status, status, order_type, processing_result, notes, store_id, create_time, update_time, create_by, update_by)
+ values
+
+ (#{entity.userId}, #{entity.orderNumber}, #{entity.giftId}, #{entity.shippingType}, #{entity.paidInfo}, #{entity.amount}, #{entity.integral}, #{entity.comeOn}, #{entity.exchangeQuantity}, #{entity.orderStatus}, #{entity.status}, #{entity.orderType}, #{entity.processingResult}, #{entity.notes}, #{entity.storeId}, #{entity.createTime}, #{entity.updateTime}, #{entity.createBy}, #{entity.updateBy})
+
+ on duplicate key update
+ user_id = values(user_id),
+ order_number = values(order_number),
+ gift_id = values(gift_id),
+ shipping_type = values(shipping_type),
+ paid_info = values(paid_info),
+ amount = values(amount),
+ integral = values(integral),
+ come_on = values(come_on),
+ exchange_quantity = values(exchange_quantity),
+ order_status = values(order_status),
+ status = values(status),
+ order_type = values(order_type),
+ processing_result = values(processing_result),
+ notes = values(notes),
+ store_id = values(store_id),
+ create_time = values(create_time),
+ update_time = values(update_time),
+ create_by = values(create_by),
+ update_by = values(update_by)
+
+
+
+
+ update integral_orders
+
+
+ user_id = #{userId},
+
+
+ order_number = #{orderNumber},
+
+
+ gift_id = #{giftId},
+
+
+ shipping_type = #{shippingType},
+
+
+ paid_info = #{paidInfo},
+
+
+ amount = #{amount},
+
+
+ integral = #{integral},
+
+
+ come_on = #{comeOn},
+
+
+ exchange_quantity = #{exchangeQuantity},
+
+
+ order_status = #{orderStatus},
+
+
+ status = #{status},
+
+
+ order_type = #{orderType},
+
+
+ processing_result = #{processingResult},
+
+
+ notes = #{notes},
+
+
+ store_id = #{storeId},
+
+
+ create_time = #{createTime},
+
+
+ update_time = #{updateTime},
+
+
+ create_by = #{createBy},
+
+
+ update_by = #{updateBy},
+
+
+ where id = #{id}
+
+
+
+
+ delete from integral_orders where id = #{id}
+
+
+
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java
index e2206e8e7..4fbcffcbb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralGiftService.java
@@ -57,4 +57,12 @@ public interface IntegralGiftService {
*/
boolean deleteById(Integer id);
+ /**
+ * 单独修改商品的库存
+ * @param id
+ * @param editInventory
+ * @return
+ */
+ boolean updateInventory(@Param("id") Integer id,@Param("editInventory") Integer editInventory);
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
new file mode 100644
index 000000000..838f8e4f1
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
@@ -0,0 +1,61 @@
+package com.fuint.business.integral.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.integral.entity.IntegralOrders;
+import com.fuint.business.integral.vo.IntegralOrdersVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * 存储兑换订单信息(IntegralOrders)表服务接口
+ *
+ * @author makejava
+ * @since 2023-11-07 13:59:23
+ */
+public interface IntegralOrdersService {
+
+ /**
+ * 通过ID查询单条数据
+ *
+ * @param id 主键
+ * @return 实例对象
+ */
+ IntegralOrders queryById(Integer id);
+
+ /**
+ * 分页查询
+ *
+ * @param integralOrders 筛选条件
+ * @param page 分页对象
+ * @return 查询结果
+ */
+ IPage queryByPage(@Param("page") Page page, @Param("integralGift") IntegralOrders integralOrders);
+
+ /**
+ * 新增数据
+ *
+ * @param integralOrders 实例对象
+ * @return 实例对象
+ */
+ IntegralOrders insert(IntegralOrders integralOrders);
+
+ /**
+ * 修改数据
+ *
+ * @param integralOrders 实例对象
+ * @return 实例对象
+ */
+ IntegralOrders update(IntegralOrders integralOrders);
+
+ /**
+ * 通过主键删除数据
+ *
+ * @param id 主键
+ * @return 是否成功
+ */
+ boolean deleteById(Integer id);
+ Map statistics();
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
index a1ece0715..ec25bbf44 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
@@ -89,4 +89,17 @@ public class IntegralGiftServiceImpl implements IntegralGiftService {
public boolean deleteById(Integer id) {
return this.integralGiftDao.deleteById(id) > 0;
}
+
+
+ /**
+ * 单独修改商品的库存
+ * @param id
+ * @param editInventory
+ * @return
+ */
+ @Override
+ public boolean updateInventory(@Param("id") Integer id,@Param("editInventory") Integer editInventory) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ return this.integralGiftDao.updateInventory(id,editInventory,nowAccountInfo.getStaffId()) > 0;
+ }
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
new file mode 100644
index 000000000..d1baea233
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
@@ -0,0 +1,96 @@
+package com.fuint.business.integral.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.fuint.business.integral.entity.IntegralGift;
+import com.fuint.business.integral.entity.IntegralOrders;
+import com.fuint.business.integral.mapper.IntegralOrdersMapper;
+import com.fuint.business.integral.service.IntegralOrdersService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.fuint.business.integral.vo.IntegralGiftVO;
+import com.fuint.business.integral.vo.IntegralOrdersVO;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+
+import javax.annotation.Resource;
+import java.util.Map;
+
+/**
+ * 存储兑换订单信息(IntegralOrders)表服务实现类
+ *
+ * @author makejava
+ * @since 2023-11-07 13:59:23
+ */
+@Service("integralOrdersService")
+public class IntegralOrdersServiceImpl implements IntegralOrdersService {
+ @Resource
+ private IntegralOrdersMapper integralOrdersDao;
+
+ /**
+ * 通过ID查询单条数据
+ *
+ * @param id 主键
+ * @return 实例对象
+ */
+ @Override
+ public IntegralOrders queryById(Integer id) {
+ return this.integralOrdersDao.queryById(id);
+ }
+
+ /**
+ * 分页查询
+ *
+ * @param integralOrders 筛选条件
+ * @param page 分页对象
+ * @return 查询结果
+ */
+ @Override
+ public IPage queryByPage(@Param("page") Page page, @Param("integralOrders") IntegralOrders integralOrders) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ integralOrders.setStoreId(nowAccountInfo.getStoreId());
+ return integralOrdersDao.queryAllByLimit(page, integralOrders);
+ }
+ /**
+ * 新增数据
+ *
+ * @param integralOrders 实例对象
+ * @return 实例对象
+ */
+ @Override
+ public IntegralOrders insert(IntegralOrders integralOrders) {
+ this.integralOrdersDao.insert(integralOrders);
+ return integralOrders;
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param integralOrders 实例对象
+ * @return 实例对象
+ */
+ @Override
+ public IntegralOrders update(IntegralOrders integralOrders) {
+ this.integralOrdersDao.update(integralOrders);
+ return this.queryById(integralOrders.getId());
+ }
+
+ /**
+ * 通过主键删除数据
+ *
+ * @param id 主键
+ * @return 是否成功
+ */
+ @Override
+ public boolean deleteById(Integer id) {
+ return this.integralOrdersDao.deleteById(id) > 0;
+ }
+
+ @Override
+ public Map statistics() {
+ return this.integralOrdersDao.statistics();
+ }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java
new file mode 100644
index 000000000..60aa9faed
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralOrdersVO.java
@@ -0,0 +1,14 @@
+package com.fuint.business.integral.vo;
+
+
+import com.fuint.business.integral.entity.IntegralOrders;
+import lombok.Data;
+
+@Data
+public class IntegralOrdersVO extends IntegralOrders {
+ private String mobile;
+ private String userNo;
+ private String name;
+ private String giftName;
+ private String coverImage;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
index fd1e7db09..9f81a1a61 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +58,18 @@ public class LJStaffController extends BaseController {
return getSuccessResult(staff);
}
+ /**
+ * 根据登录账户名查询员工信息
+ * @return
+ */
+ @GetMapping("/name")
+ public ResponseObject staff(){
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ Integer staffId = nowAccountInfo.getStaffId();
+ LJStaff staff = mtStaffService.selectStaffById(staffId);
+ return getSuccessResult(staff);
+ }
+
/**
* 根据id查询员工信息
* @param map
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
new file mode 100644
index 000000000..eacaab253
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
@@ -0,0 +1,47 @@
+package com.fuint.business.order.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.entity.OilOrder;
+import com.fuint.business.order.service.OilOrderService;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/business/oilOrder")
+public class OilOrderController extends BaseController {
+ @Autowired
+ private OilOrderService orderService;
+
+ /**
+ * 根据条件分页查询会员信息
+ * @param order
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @GetMapping("/list")
+ public ResponseObject list(OilOrder order,
+ @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+ Page page =new Page(pageNo,pageSize);
+ IPage list = orderService.selectOilOrderList(page,order);
+ return getSuccessResult(list);
+ }
+
+ /**
+ * 批量添加订单信息
+ * @param map
+ * @return
+ */
+ @PostMapping
+ public ResponseObject add(@Validated @RequestBody Map map){
+ int row = orderService.insertOilOrder(map);
+ return getSuccessResult(row);
+ }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
index 28c4618f6..fff969131 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
@@ -12,11 +12,14 @@ import java.util.Date;
import java.io.Serializable;
/**
- * 订单表(MtOrder)实体类
+ * 商品订单表(Order)实体类
+ *
+ * @author makejava
+ * @since 2023-11-07 15:04:17
*/
@Data
@TableName("mt_order")
-@ApiModel(value = "LJOrder对象", description = "订单表")
+@ApiModel(value = "LJOrder对象", description = "商品订单表")
public class LJOrder extends BaseEntity implements Serializable {
private static final long serialVersionUID = 1L;
@@ -26,14 +29,14 @@ public class LJOrder extends BaseEntity implements Serializable {
@ApiModelProperty("自增ID")
@TableId(value = "ID", type = IdType.AUTO)
private Integer id;
- /**
- * 订单类型
- */
- private String type;
/**
* 终端
*/
private String terminal;
+ /**
+ * 订单类型
+ */
+ private String type;
/**
* 付款用户
*/
@@ -50,14 +53,14 @@ public class LJOrder extends BaseEntity implements Serializable {
* 所属店铺ID
*/
private Integer storeId;
+ /**
+ * 商品id
+ */
+ private Integer goodId;
/**
* 用户ID
*/
private Integer userId;
- /**
- * 商品数量
- */
- private Double goodsNum;
/**
* 订单金额
*/
@@ -66,6 +69,10 @@ public class LJOrder extends BaseEntity implements Serializable {
* 支付金额
*/
private Double payAmount;
+ /**
+ * 商品数量
+ */
+ private Integer goodsNum;
/**
* 使用积分数量
*/
@@ -75,7 +82,7 @@ public class LJOrder extends BaseEntity implements Serializable {
*/
private Double pointAmount;
/**
- * 折扣金额
+ * 优惠金额
*/
private Double discount;
/**
@@ -94,6 +101,5 @@ public class LJOrder extends BaseEntity implements Serializable {
* 操作员工
*/
private Integer staffId;
-
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
new file mode 100644
index 000000000..2d2772d2c
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
@@ -0,0 +1,118 @@
+package com.fuint.business.order.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuint.framework.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 油品订单表(OilOrder)实体类
+ *
+ * @author makejava
+ * @since 2023-11-07 15:10:07
+ */
+@Data
+@TableName("oil_order")
+@ApiModel(value = "OilOrder对象", description = "油品订单表")
+public class OilOrder extends BaseEntity implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * 自增ID
+ */
+ @ApiModelProperty("自增ID")
+ @TableId(value = "ID", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 店铺id
+ */
+ private Integer storeId;
+ /**
+ * 用户id
+ */
+ private Integer userId;
+ /**
+ * 优惠券id
+ */
+ private Integer couponId;
+ /**
+ * 提成金额
+ */
+ private Double commissionAmount;
+ /**
+ * 员工id
+ */
+ private Integer staffId;
+ /**
+ * 终端
+ */
+ private String terminal;
+ /**
+ * 订单号
+ */
+ private String orderNo;
+ /**
+ * 油品
+ */
+ private String oils;
+ /**
+ * 油枪号
+ */
+ private Integer oilGunNum;
+ /**
+ * 油品数量
+ */
+ private Double oilNum;
+ /**
+ * 订单金额
+ */
+ private Double orderAmount;
+ /**
+ * 优惠金额
+ */
+ private Double discountAmount;
+ /**
+ * 实付金额
+ */
+ private Double payAmount;
+ /**
+ * 付款用户
+ */
+ private String payUser;
+ /**
+ * 付款类型：微信、支付宝等、赊账
+ */
+ private String payType;
+ /**
+ * 开票标识：已开票、未开票
+ */
+ private String invoicing;
+ /**
+ * 订单状态：已支付、未支付
+ */
+ private String orderStatus;
+ /**
+ * 支付时间
+ */
+ private Date payTime;
+ /**
+ * 富友订单号
+ */
+ private Integer reservedFyOrderNo;
+ /**
+ * 富友渠道交易流水号
+ */
+ private Integer reservedTransactionId;
+ /**
+ * 订单备注
+ */
+ private String remark;
+
+}
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
new file mode 100644
index 000000000..4799995ff
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
@@ -0,0 +1,20 @@
+package com.fuint.business.order.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.entity.OilOrder;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 油品订单表 Mapper层
+ */
+public interface OilOrderMapper extends BaseMapper {
+ /**
+ * 根据条件分页查询油品订单信息
+ * @param page
+ * @param order
+ * @return
+ */
+ public IPage selectOilOrderList(Page page, @Param("order") OilOrder order);
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
new file mode 100644
index 000000000..f64cccb2f
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -0,0 +1,35 @@
+
+
+
+
+ select * from oil_order
+
+
+
+
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
new file mode 100644
index 000000000..575c03162
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
@@ -0,0 +1,28 @@
+package com.fuint.business.order.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuint.business.order.entity.OilOrder;
+
+import java.util.Map;
+
+/**
+ * 油品订单信息 业务层
+ */
+public interface OilOrderService extends IService {
+ /**
+ * 根据条件分页查询油品订单信息
+ * @param page
+ * @param order
+ * @return
+ */
+ public IPage selectOilOrderList(Page page, OilOrder order);
+
+ /**
+ * 添加油品订单信息
+ * @param map
+ * @return
+ */
+ public int insertOilOrder(Map map);
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
new file mode 100644
index 000000000..bad28169e
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -0,0 +1,63 @@
+package com.fuint.business.order.service.impl;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.order.entity.OilOrder;
+import com.fuint.business.order.mapper.OilOrderMapper;
+import com.fuint.business.order.service.OilOrderService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+public class OilOrderServiceImpl extends ServiceImpl implements OilOrderService {
+ @Override
+ public IPage selectOilOrderList(Page page, OilOrder order) {
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ Integer storeId = nowAccountInfo.getStoreId();
+ order.setStoreId(storeId);
+ IPage oilOrderIPage = baseMapper.selectOilOrderList(page, order);
+ return oilOrderIPage;
+ }
+
+ @Override
+ public int insertOilOrder(Map map) {
+ String oilOrder = map.get("oilOrder");
+ String goodsOrder = map.get("goodsOrder");
+ String payType = map.get("payType");
+ List jsonObjects = JSONArray.parseArray(oilOrder, JSONObject.class);
+ OilOrder order = new OilOrder();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ String timestamp = dateFormat.format(new Date());
+ String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
+// 添加油品订单信息
+ for (JSONObject object : jsonObjects) {
+ order.setOrderNo(timestamp+randomString);
+ double amount = (double) object.get("amount");
+ double oilPrice = (double) object.get("oilPrice");
+ double oilNum = amount/oilPrice;
+ order.setOilNum(oilNum);
+ order.setPayType(payType);
+ order.setOils((String) object.get("oilName"));
+ order.setOilGunNum((Integer) object.get("oilGunNum"));
+ order.setOrderAmount((Double) object.get("amount"));
+ System.out.println(object.get("oilGunNum"));
+ System.out.println(object.get("numberId"));
+ System.out.println(object.get("oilName"));
+ System.out.println(object.get("oilPrice"));
+ System.out.println(object.get("amount"));
+ }
+
+// int row = baseMapper.insert(order);
+ return 0;
+ }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
index be6f3e9a7..6c8445a03 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
/**
@@ -87,6 +88,18 @@ public class LJUserController extends BaseController {
return getSuccessResult(userVo);
}
+ /**
+ * 根据手机号查询会员信息
+ * @param map
+ * @return
+ */
+ @PostMapping("/name")
+ public ResponseObject userVoByName(@Validated @RequestBody Map map){
+ String name = map.get("name");
+ List list = userService.queryUserByName(name);
+ return getSuccessResult(list);
+ }
+
/**
* 批量删除会员信息
* @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java
index b7f748c1b..9f1da86a3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/LJUserMapper.java
@@ -7,6 +7,8 @@ import com.fuint.business.userManager.entity.LJUser;
import com.fuint.business.userManager.vo.LJUserVo;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* 会员信息 mapper层
*/
@@ -26,6 +28,13 @@ public interface LJUserMapper extends BaseMapper {
*/
public LJUserVo selectUserByMobile(@Param("mobile") String mobile);
+ /**
+ * 根据会员昵称模糊查询会员信息
+ * @param name
+ * @return
+ */
+ public List selectUserByName(@Param("name") String name);
+
/**
* 统计信息
* @param storeId
@@ -33,4 +42,5 @@ public interface LJUserMapper extends BaseMapper {
* @return
*/
public Double selectSumByStore(@Param("storeId") int storeId,@Param("sumValue") String sumValue);
+
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
index ae9b52a50..7bc2d2274 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
@@ -51,4 +51,11 @@
mu.mobile = #{mobile}
+
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
index 938fb6f54..f23869e6b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
@@ -47,6 +47,13 @@ public interface LJUserService extends IService {
*/
public LJUserVo queryUserByMobile(String mobile);
+ /**
+ * 根据会员昵称模糊查询会员信息
+ * @param name
+ * @return
+ */
+ public List queryUserByName(String name);
+
/**
* 根据id删除会员信息
* @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
index f250cd91e..5d70f7c42 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
@@ -109,6 +109,17 @@ public class LJUserServiceImpl extends ServiceImpl impleme
return userVo;
}
+ /**
+ * 根据会员昵称模糊查询会员信息
+ * @param name
+ * @return
+ */
+ @Override
+ public List queryUserByName(String name) {
+ List list = baseMapper.selectUserByName(name);
+ return list;
+ }
+
/**
* 根据id删除会员信息
* @param id
diff --git a/fuintCashierWeb/src/api/cashier/ljgoods.js b/fuintCashierWeb/src/api/cashier/ljgoods.js
index 4d0d97194..1013a970d 100644
--- a/fuintCashierWeb/src/api/cashier/ljgoods.js
+++ b/fuintCashierWeb/src/api/cashier/ljgoods.js
@@ -9,6 +9,14 @@ export function listLJGoods(query) {
})
}
+// 查询商品列表
+export function listgoods() {
+ return request({
+ url: '/business/convenience/goods/queryList',
+ method: 'get',
+ })
+}
+
// 查询商品详细
export function getLJGoods(id) {
return request({
diff --git a/fuintCashierWeb/src/api/cashier/oilorder.js b/fuintCashierWeb/src/api/cashier/oilorder.js
new file mode 100644
index 000000000..5596598fd
--- /dev/null
+++ b/fuintCashierWeb/src/api/cashier/oilorder.js
@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+// 查询油品订单列表
+export function listOilOrder(query) {
+ return request({
+ url: '/business/oilOrder/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 新增油品订单信息
+export function addLJGoods(data) {
+ return request({
+ url: '/business/oilOrder',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/fuintCashierWeb/src/api/cashier/staff.js b/fuintCashierWeb/src/api/cashier/staff.js
index 0b1b01c11..50988682c 100644
--- a/fuintCashierWeb/src/api/cashier/staff.js
+++ b/fuintCashierWeb/src/api/cashier/staff.js
@@ -25,6 +25,14 @@ export function getStaff(id) {
})
}
+// 查询当前登录账号信息
+export function staffInfo() {
+ return request({
+ url: '/business/member/staff/name',
+ method: 'get'
+ })
+}
+
// 根据手机号查询员工详情
export function queryStaff(data) {
return request({
diff --git a/fuintCashierWeb/src/api/cashier/user.js b/fuintCashierWeb/src/api/cashier/user.js
index 8fde919f5..1e17fe70b 100644
--- a/fuintCashierWeb/src/api/cashier/user.js
+++ b/fuintCashierWeb/src/api/cashier/user.js
@@ -9,24 +9,6 @@ export function listUser(query) {
})
}
-// 查询会员列表
-export function listStatistic(query) {
- return request({
- url: '/business/userManager/user/statistic',
- method: 'get',
- params: query
- })
-}
-
-// 根据手机号查询会员详细
-export function getUserMobile(data) {
- return request({
- url: '/business/userManager/user/mobile' ,
- method: 'post',
- data: data
- })
-}
-
// 根据手机号查询会员详细
export function getUserVoMobile(data) {
return request({
@@ -36,4 +18,13 @@ export function getUserVoMobile(data) {
})
}
+// 根据手机号查询会员详细
+export function getUserVoName(data) {
+ return request({
+ url: '/business/userManager/user/name',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/fuintCashierWeb/src/api/cashier/usergrade.js b/fuintCashierWeb/src/api/cashier/usergrade.js
new file mode 100644
index 000000000..7eeae693a
--- /dev/null
+++ b/fuintCashierWeb/src/api/cashier/usergrade.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询会员等级列表
+export function listUserGrade(query) {
+ return request({
+ url: '/business/userManager/userGrade/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询会员等级详细
+export function getUserGrade(id) {
+ return request({
+ url: '/business/userManager/userGrade/' + id,
+ method: 'get'
+ })
+}
+
+// 根据会员等级名称查询会员等级信息
+export function queryUserGrade(data) {
+ return request({
+ url: '/business/userManager/userGrade/getName',
+ method: 'post',
+ data: data
+ })
+}
+
+// 新增会员等级
+export function addUserGrade(data) {
+ return request({
+ url: '/business/userManager/userGrade',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改会员等级
+export function updateUserGrade(data) {
+ return request({
+ url: '/business/userManager/userGrade',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除会员等级
+export function delUserGrade(id) {
+ return request({
+ url: '/business/userManager/userGrade/' + id,
+ method: 'delete'
+ })
+}
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 8c5926af7..b1e5c89ca 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -3,14 +3,54 @@
@@ -94,13 +134,13 @@
-
-
diff --git a/fuintAdmin/src/views/EventMarketing/online/index.vue b/fuintAdmin/src/views/EventMarketing/online/index.vue
new file mode 100644
index 000000000..e8b767af2
--- /dev/null
+++ b/fuintAdmin/src/views/EventMarketing/online/index.vue
@@ -0,0 +1,74 @@
+
+
+
+ {{ scope.row.categoryName==null? '不分类': scope.row.categoryName}}
+
+
@@ -80,7 +84,13 @@
-
+
+
+ {{row}}
+ + +
--
@@ -92,15 +102,17 @@
- {{ scope.row.totalInventory }}
+ {{ scope.row.totalInventory===-1?'无限制': scope.row.totalInventory}}
-
+
+
+
+
- {{ scope.row.totalInventory-scope.row.remainingInventory }}
+ {{ scope.row.totalInventory===-1?scope.row.totalInventory-scope.row.usedInventory+1: scope.row.totalInventory-scope.row.usedInventory}}
-
@@ -144,10 +156,12 @@
-
+
+
+
@@ -275,7 +289,7 @@
-
@@ -363,7 +377,7 @@
-
+
个
@@ -489,13 +503,49 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 增加库存
+ 减少库存
+ 不限库存
+
+
+
+
+ +
+
+
+ -
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/integral/order/index.vue b/fuintAdmin/src/views/integral/order/index.vue
new file mode 100644
index 000000000..3b21ad263
--- /dev/null
+++ b/fuintAdmin/src/views/integral/order/index.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue
index ddbe4594f..456e68406 100644
--- a/fuintAdmin/src/views/integral/gift/index.vue
+++ b/fuintAdmin/src/views/integral/gift/index.vue
@@ -44,7 +44,11 @@
v-loading="loading"
:data="dataList"
:default-sort="defaultSort">
-
+
+ 卡券核销:
+
+
+
+ 搜索
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/integral/order/pointsCashier.vue b/fuintAdmin/src/views/integral/order/pointsCashier.vue
new file mode 100644
index 000000000..e69b0e5dd
--- /dev/null
+++ b/fuintAdmin/src/views/integral/order/pointsCashier.vue
@@ -0,0 +1,184 @@
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单详情
+ 处理订单
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintAdmin/src/views/integral/order/pointsMall.vue b/fuintAdmin/src/views/integral/order/pointsMall.vue
new file mode 100644
index 000000000..6a51a6dc0
--- /dev/null
+++ b/fuintAdmin/src/views/integral/order/pointsMall.vue
@@ -0,0 +1,201 @@
+
+
+ 统计
+
+
+ 笔数
+ 1234
+
+
+
+ 商品数量
+ 12334
+
+
+ 积分
+ 0
+
+
+ 支付总额
+ 0
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 待处理/待发货
+
+ 已完成/已发货
+
+ 已拒绝/已退款
+
+
+
+
+
+
+
+
+
+
+ {{ props.row.orderNumber }}
+
+
+
+ {{ props.row.userNo }}
+
+
+ +
+ {{ props.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单详情
+ 处理订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties
index 1aa8a9b12..668ed2f0d 100644
--- a/fuintBackend/configure/dev/application.properties
+++ b/fuintBackend/configure/dev/application.properties
@@ -38,7 +38,7 @@ images.root=C:/fuintV3.0.1/fuintBackend/fuint-application/target/classes
images.path=/static/uploadImages/
# 上传图片服务器域名
-images.upload.url=http://localhost:8080
+images.upload.url=http://localhost:8008
# 上传图片允许的大小（单位：MB）
images.upload.maxSize=5
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java
index 8355fe9d6..d96c988a3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
/**
@@ -38,6 +39,12 @@ public class LJGoodsController extends BaseController {
return getSuccessResult(list);
}
+ @GetMapping("/queryList")
+ public ResponseObject queryList(){
+ List+
+ +
-
@@ -41,10 +81,10 @@
+
+
会员登录
+
+
+
+
+ ![]()
+ 
+
+
+
+
+
+ {{ member.name }}
+ {{ member.mobile }} +
+ + {{ member.mobile }} +
+
+
+
+
+
+
+ 会员储值账户余额：{{ member.cardBalance }}
+积分余额：{{ member.points }}
+
+
+
+
+
+ 会员等级：{{ getGrade(member.gradeId) }}
+
+
+
+
+ 重置会员
+
-
油品:￥200.00
- 商品:￥0.52
- 合计: ￥200.52
+ 油品:￥{{ oilAmount }}
+ 商品:￥{{ goodsAmount }}
+ 合计: ￥{{ oilAmount + goodsAmount }}
满减活动
@@ -19,15 +59,15 @@
扫码支付
- 394.7
+ {{ oilAmount + goodsAmount }}
找零
- 394.7
+ 0
-
加油员
- 加油员名称
+ 加油员
+ {{ staff.realName }}
-
- ￥349.78
+ ￥{{ oilAmount + goodsAmount }}
优惠合计：5.74元
立即结算
+ 立即结算
-
订单笔数 3件
- 订单金额 ￥2.03
+ 订单笔数 {{ oilTotal }}件
+ 订单金额 ￥{{ oilAmount }}
-
新增订单
+ 新增订单
解锁
非油商品
-
+
+
+
+
+
+
+ {{ item.name }}
+ {{ item.retailPrice }}
+
+
+
- 商品
@@ -128,23 +178,37 @@
操作
-
商品名称
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.name }}
-
0.01
-
+
{{ item.retailPrice }}
+
+
+
-
商品数量 3件
- 商品总额 ￥2.03
+ 商品数量 {{ goodsTotal }}件
+ 商品总额 ￥{{ goodsAmount }}
-
-
{
+ response.data.num = 1
+ this.goodsAmount += response.data.retailPrice
+ this.goodsOrder.push(response.data);
+ this.goodsTotal += 1;
+ })
+ }
+ this.goods = ""
+ },
+ // 立即结算
+ settlement(){
+ this.dialogVisiblej = true
+ },
+ // 新增订单（重置）
+ resetting(){
+ this.oilOrder = [];
+ this.oilTotal = 0;
+ this.oilAmount = 0;
+ },
+ // 获取员工列表
getStaffList(){
queryStaffs().then( response => {
this.staffList = response.data
})
},
- // 订单信息
+ // 油品订单信息
getOilOrder(){
this.dialogVisibleamount = false
this.oilOrder.push(this.form)
+ if (this.select == "元"){
+ this.oilAmount = +this.form.amount + this.oilAmount;
+ }else {
+ this.oilAmount = +(this.form.oilPrice * this.form.amount) + this.oilAmount;
+ }
this.oilTotal += 1;
},
// 选择“元”或“L”
@@ -439,48 +659,24 @@
this.oilNameList = response.data;
})
},
+ // 根据手机号查询会员信息
getUser(){
- getUserVoMobile({mobile:this.userNo}).then( response => {
- this.member = response.data
- // console.log(this.member)
- })
- },
- querySearchAsync(queryString, cb) {
- var restaurants = this.goodsList;
- // console.log(queryString)
- this.goodsList.forEach(item => {
- item.indexOf(queryString)
- })
- },
- handleSelect(item) {
- // console.log(item);
- },
- // 查询商品信息
- queryGoods(val){
- // console.log(this.goods)
- let map = {
- page:1,
- pageSize:40,
- name:this.goods,
- isRecovery:0,
+ if(this.select1=="会员手机号"){
+ getUserVoMobile({mobile:this.userNo}).then( response => {
+ this.member = response.data
+ })
+ }else {
+ getUserVoName({name:this.userNo}).then( response => {
+ this.memberList = response.data
+ })
+ this.dialogVisibleMember = true;
}
- let map1 = {
- page:1,
- pageSize:40,
- goodsNo:this.goods,
- isRecovery:0,
- }
- listLJGoods(map).then( response => {
- if(response.data.records!=null){
- this.goodsList = response.data.records
- }
+ },
+ // 查询所有商品信息
+ getGoods(){
+ listgoods().then( response => {
+ this.goodsList = response.data
})
- listLJGoods(map1).then( response => {
- if(response.data.records!=null){
- this.goodsList = response.data.records
- }
- })
- // console.log(this.goodsList)
},
// 加油金额
refuel(id){
@@ -492,17 +688,24 @@
},
// 确定收款
collection(){
- let map = {
- authCode : this.authCode,
- orderNo : "0000055"
- }
- // console.log(map)
- fyPay(map).then( response => {
- // console.log(response)
+ // JSON.parse()
+ this.map.oilOrder = JSON.stringify(this.oilOrder);
+ this.map.goodsOrder = JSON.stringify(this.goodsOrder);
+ addLJGoods(this.map).then( response => {
+ console.log(response)
})
+ // let map = {
+ // authCode : this.authCode,
+ // orderNo : "0000055"
+ // }
+ // // console.log(map)
+ // fyPay(map).then( response => {
+ // // console.log(response)
+ // })
},
+ // 支付方式
payMethod(payType){
- // console.log(payType)
+ this.map.payType = payType;
},
// 获取支付方式
getPayList(){
@@ -526,7 +729,15 @@
.catch(_ => {});
},
handleChange(value) {
- // console.log(value);
+ let goods = this.goodsOrder;
+ let num = 0;
+ let amount = 0;
+ goods.forEach(item => {
+ num += item.num
+ amount += item.retailPrice*item.num
+ })
+ this.goodsTotal = num;
+ this.goodsAmount = amount;
},
handleClick(tab, event) {
let oilNum = ""
@@ -545,7 +756,7 @@
gocomponents(index){
this.leftindex = index
},
- }
+ },
}
清空
+ 清空
取单
挂单
@@ -160,38 +224,30 @@
:close-on-click-modal="false">
-
-
-
-
-
-
-
-
{{ item.name }}
- {{ item.mobile }}
+ {{ item.realName }}
+ {{ item.mobile }}
付款金额
+ 应收金额
- ￥300.00
-
- 汽油
-
+ ￥{{ oilAmount + goodsAmount }}
+
+
+ 合计金额：{{ oilAmount + goodsAmount }}元、优惠合计13.02元
- 赠送金额
-
+
@@ -306,9 +395,11 @@
import {getDicts} from "@/api/dict/data";
import {getOilNameList, getOilNumGun, getOilNumGunById, listOilNumGun} from "@/api/cashier/oilnumgun";
import {fyPay} from "@/api/cashier/pay";
- import {listLJGoods} from "@/api/cashier/ljgoods";
- import {getUserVoMobile} from "@/api/cashier/user";
- import {queryStaffs} from "@/api/cashier/staff";
+ import {getLJGoods, listgoods} from "@/api/cashier/ljgoods";
+ import {getUserVoMobile, getUserVoName} from "@/api/cashier/user";
+ import {queryStaffs, staffInfo} from "@/api/cashier/staff";
+ import {addLJGoods} from "@/api/cashier/oilorder";
+ import {getUserGrade} from "@/api/cashier/usergrade";
export default {
name: "homeindex",
@@ -316,8 +407,16 @@
return{
// 油品订单
oilOrder:[],
+ // 油品金额
+ oilAmount:0,
// 油品订单数
oilTotal:0,
+ // 商品订单
+ goodsOrder:[],
+ // 商品金额
+ goodsAmount:0,
+ // 商品订单数
+ goodsTotal:0,
// 加油金额
rise:[
{value:"￥100"},
@@ -327,6 +426,8 @@
],
// 会员信息
member:{},
+ // 会员列表信息
+ memberList:[],
select1:'会员手机号',
// 会员信息
userNo:"",
@@ -350,6 +451,7 @@
dialogVisiblej: false,
dialogVisiblevip:false,
dialogVisibleamount:false,
+ dialogVisibleMember:false,
activeName: '1',
tabarr:[
{name:'收银台',icon:'el-icon-s-platform'},
@@ -371,28 +473,146 @@
{color:'#ecfae5'},
{color:'#fafafa'}
],
+ restaurants:'',
num: 1,
// 油号名称
oilNameList:'',
// 员工列表
staffList:[],
+ isMember: false,
+ // 员工信息
+ staff:"",
+ map:{
+ // 油品订单
+ oilOrder:"",
+ // 商品订单
+ goodsOrder:"",
+ // 支付方式
+ payType:"",
+ // 油品订单金额
+ oilAmount:"",
+ // 商品订单金额
+ goodsAmount:"",
+ // 油品实付金额
+ oilActualPay:"",
+ // 商品实付金额
+ goodsActualPay:"",
+ // 付款用户
+ payUser:"",
+ // 油品优惠金额
+ oilDiscount:"",
+ // 商品优惠金额
+ goodsDiscount:"",
+ },
+ gradeName:"",
}
},
created() {
this.getPayList();
- this.queryGoods();
this.getOilName();
+ this.getGoods();
+ this.getStaffList();
+ this.getStaff();
},
methods:{
+ // 重置会员
+ resetMember(){
+ this.member = {};
+ this.isMember = false;
+ },
+ // 获取会员等级信息
+ getGrade(id){
+ getUserGrade(id).then( response => {
+ this.gradeName = response.data.name;
+ })
+ return this.gradeName;
+ },
+ // 选择会员
+ chooseUser(){
+ this.dialogVisiblevip = false
+ this.isMember = true;
+ },
+ // 选择会员信息
+ handleChoose(data){
+ this.member = data;
+ this.dialogVisibleMember = false;
+ },
+ // 清空商品订单列表
+ empty(){
+ this.goodsOrder = [];
+ this.goodsTotal = 0;
+ this.goodsAmount = 0;
+ },
+ // 获取当前账户信息
+ getStaff(){
+ staffInfo().then( response => {
+ this.staff = response.data
+ })
+ },
+ // 选择员工信息
+ chooseStaff(data){
+ this.staff = data;
+ },
+ // 删除商品列表信息
+ delGoods(index){
+ this.goodsOrder.splice(index,1)
+ },
+ // 添加商品列表信息
+ changeGoods(val){
+ let result = true;
+ let goods = this.goodsOrder
+ if (this.goodsOrder.length>0){
+ let amount = 0;
+ for (let i = 0; i
+
+
+
+ ![]()
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 选择
+
+
+
+
+
+
+