diff --git a/fuintAdmin/src/api/integral/category.js b/fuintAdmin/src/api/integral/category.js index 14c469ec3..8ca089732 100644 --- a/fuintAdmin/src/api/integral/category.js +++ b/fuintAdmin/src/api/integral/category.js @@ -1,6 +1,6 @@ import request from "@/utils/request"; -// 查询油罐列表 +// 查询积分分类 export function getGiftCategoryApi(data) { return request({ url: 'business/integral/integralGiftCategory/queryByPage', diff --git a/fuintAdmin/src/api/integral/gift.js b/fuintAdmin/src/api/integral/gift.js index 14c469ec3..251cff955 100644 --- a/fuintAdmin/src/api/integral/gift.js +++ b/fuintAdmin/src/api/integral/gift.js @@ -1,25 +1,25 @@ import request from "@/utils/request"; // 查询油罐列表 -export function getGiftCategoryApi(data) { +export function getGiftApi(data) { return request({ - url: 'business/integral/integralGiftCategory/queryByPage', + url: 'business/integral/integralGift/queryByPage', method: 'get', params: data }) } // 新增有关信息 - export function insertGiftCategoryApi(data) { + export function insertGiftApi(data) { return request({ - url: 'business/integral/integralGiftCategory', + url: 'business/integral/integralGift', method: 'post', data: data }) } // 修改有关信息 - export function updateGiftCategoryApi(data) { + export function updateGiftApi(data) { return request({ - url: 'business/integral/integralGiftCategory', + url: 'business/integral/integralGift', method: 'put', data: data }) diff --git a/fuintAdmin/src/api/integral/giftForm.js b/fuintAdmin/src/api/integral/giftForm.js deleted file mode 100644 index 7715ab3d0..000000000 --- a/fuintAdmin/src/api/integral/giftForm.js +++ /dev/null @@ -1,8 +0,0 @@ -Vue.component('button-counter', { - data: function () { - return { - count: 0 - } - }, - template: '' -}) \ No newline at end of file diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue index 0cc1c8e24..ddbe4594f 100644 --- a/fuintAdmin/src/views/integral/gift/index.vue +++ b/fuintAdmin/src/views/integral/gift/index.vue @@ -1,10 +1,10 @@ - + + + - - diff --git a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue index fa9e5c31c..c4f5b0895 100644 --- a/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue +++ b/fuintAdmin/src/views/oilConfig/oilPurchase/list.vue @@ -134,7 +134,6 @@ export default { data() { return { purchaseList: [], - suppliersList: [], // 弹出框标题 title:'', 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 5dab4cc8c..de71c07e2 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 @@ -19,7 +19,7 @@ import javax.annotation.Resource; * @since 2023-11-02 14:18:52 */ @RestController -@RequestMapping("integralGift") +@RequestMapping("business/integral/integralGift") public class IntegralGiftController extends BaseController { /** * 服务对象 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 e630ccd24..5ab37fdfd 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 @@ -1,5 +1,8 @@ package com.fuint.business.integral.entity; +import com.fuint.repository.model.base.BaseEntity; +import lombok.Data; + import java.util.Date; import java.io.Serializable; @@ -9,7 +12,8 @@ import java.io.Serializable; * @author makejava * @since 2023-11-02 14:18:52 */ -public class IntegralGift implements Serializable { +@Data +public class IntegralGift extends BaseEntity { private static final long serialVersionUID = -94300211865653814L; /** * 礼品ID @@ -115,263 +119,6 @@ public class IntegralGift implements Serializable { * 店铺ID */ private Integer storeId; - /** - * 创建时间 - */ - private Date createTime; - /** - * 更新时间 - */ - private Date updateTime; - /** - * 创建人 - */ - private Integer createBy; - /** - * 更新人 - */ - private Integer updateBy; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getGiftName() { - return giftName; - } - - public void setGiftName(String giftName) { - this.giftName = giftName; - } - - public Integer getCategoryId() { - return categoryId; - } - - public void setCategoryId(Integer categoryId) { - this.categoryId = categoryId; - } - - public String getCoverImage() { - return coverImage; - } - - public void setCoverImage(String coverImage) { - this.coverImage = coverImage; - } - - public String getGiftImages() { - return giftImages; - } - - public void setGiftImages(String giftImages) { - this.giftImages = giftImages; - } - - public String getGiftType() { - return giftType; - } - - public void setGiftType(String giftType) { - this.giftType = giftType; - } - - public Integer getCouponId() { - return couponId; - } - - public void setCouponId(Integer couponId) { - this.couponId = couponId; - } - - public Integer getVoucherId() { - return voucherId; - } - - public void setVoucherId(Integer voucherId) { - this.voucherId = voucherId; - } - - public Integer getGoodsId() { - return goodsId; - } - - public void setGoodsId(Integer goodsId) { - this.goodsId = goodsId; - } - - public Integer getGiftQuantity() { - return giftQuantity; - } - - public void setGiftQuantity(Integer giftQuantity) { - this.giftQuantity = giftQuantity; - } - - public Integer getTotalInventory() { - return totalInventory; - } - - public void setTotalInventory(Integer totalInventory) { - this.totalInventory = totalInventory; - } - - public Integer getRemainingInventory() { - return remainingInventory; - } - - public void setRemainingInventory(Integer remainingInventory) { - this.remainingInventory = remainingInventory; - } - - public Integer getMerchantCouponId() { - return merchantCouponId; - } - - public void setMerchantCouponId(Integer merchantCouponId) { - this.merchantCouponId = merchantCouponId; - } - - public String getExchangeMethod() { - return exchangeMethod; - } - - public void setExchangeMethod(String exchangeMethod) { - this.exchangeMethod = exchangeMethod; - } - - public Integer getExchangePoints() { - return exchangePoints; - } - - public void setExchangePoints(Integer exchangePoints) { - this.exchangePoints = exchangePoints; - } - - public Double getMoneyRatio() { - return moneyRatio; - } - - public void setMoneyRatio(Double moneyRatio) { - this.moneyRatio = moneyRatio; - } - - public Double getExchangeAmount() { - return exchangeAmount; - } - - public void setExchangeAmount(Double exchangeAmount) { - this.exchangeAmount = exchangeAmount; - } - - public Double getExchangeFuelAmount() { - return exchangeFuelAmount; - } - - public void setExchangeFuelAmount(Double exchangeFuelAmount) { - this.exchangeFuelAmount = exchangeFuelAmount; - } - - public String getDeliveryMethod() { - return deliveryMethod; - } - - public void setDeliveryMethod(String deliveryMethod) { - this.deliveryMethod = deliveryMethod; - } - - public Double getExpressShippingFee() { - return expressShippingFee; - } - - public void setExpressShippingFee(Double expressShippingFee) { - this.expressShippingFee = expressShippingFee; - } - - public Double getShippingFeeAmount() { - return shippingFeeAmount; - } - - public void setShippingFeeAmount(Double shippingFeeAmount) { - this.shippingFeeAmount = shippingFeeAmount; - } - - public Integer getExchangeTimes() { - return exchangeTimes; - } - - public void setExchangeTimes(Integer exchangeTimes) { - this.exchangeTimes = exchangeTimes; - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getDetailedDescription() { - return detailedDescription; - } - - public void setDetailedDescription(String detailedDescription) { - this.detailedDescription = detailedDescription; - } - - public Integer getStoreId() { - return storeId; - } - - public void setStoreId(Integer storeId) { - this.storeId = storeId; - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public Integer getCreateBy() { - return createBy; - } - - public void setCreateBy(Integer createBy) { - this.createBy = createBy; - } - - public Integer getUpdateBy() { - return updateBy; - } - - public void setUpdateBy(Integer updateBy) { - this.updateBy = updateBy; - } } 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 7809df371..c85909df4 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 @@ -2,7 +2,7 @@ - + @@ -33,6 +33,10 @@ + + + + @@ -50,98 +54,87 @@ @@ -247,7 +240,7 @@ 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}, #{updateTime}, #{createBy}, #{updateBy}) + 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}) 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 a4d821bf0..a1ece0715 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 @@ -60,6 +60,9 @@ public class IntegralGiftServiceImpl implements IntegralGiftService { */ @Override public IntegralGift insert(IntegralGift integralGift) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + integralGift.setStoreId(nowAccountInfo.getStoreId()); + integralGift.setCreateBy(nowAccountInfo.getStaffId().toString()); this.integralGiftDao.insert(integralGift); return integralGift; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java index 5126cdcc8..eb05d6430 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/vo/IntegralGiftVO.java @@ -5,6 +5,8 @@ import lombok.Data; @Data public class IntegralGiftVO extends IntegralGift { + // 分类名称 + private String categoryName; // 商品 // 优惠卷 }