From b0aa720ccbb3ec41b36b537f1c41121c285e9998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Fri, 22 Dec 2023 17:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardValue/dto/CardValueRecordDTO.java | 3 + .../impl/CardValueRecordServiceImpl.java | 53 +++-- .../controller/CardValueOrdersController.java | 92 ++++++++ .../entity/CardValueOrders.java | 197 ++++++++++++++++++ .../mapper/CardValueOrdersMapper.java | 15 ++ .../service/CardValueOrdersService.java | 15 ++ .../impl/CardValueOrdersServiceImpl.java | 19 ++ 7 files changed, 367 insertions(+), 27 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java index eb33a95a0..0484f3768 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java @@ -12,6 +12,9 @@ public class CardValueRecordDTO extends CardValueRecord { private String obtain; private String authCode; private Double realyPayBills; + //付款类型 1.微信 2.支付宝 + private String payType; + //优惠券 // /** // * 会员id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index 398a6cb02..116c5993b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -17,6 +17,8 @@ import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapp import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; import com.fuint.business.marketingActivity.cardValue.vo.Excel.CardValueRecordExcel; +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; +import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService; import com.fuint.business.order.entity.CardBalanceChange; import com.fuint.business.order.service.CardBalanceChangeService; import com.fuint.business.userManager.entity.UserBalance; @@ -77,6 +79,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("authCode",cardValueRecordDTO.getAuthCode()); - map.put("allAmount",allAmount.toString()); + map.put("allAmount",cardValueOrders.getAmount().toString()); map.put("orderNo",orderNo); map.put("payType",cardValueRecordDTO.getPaymentType()); map.put("insCd",merchantConfig.getInsCd()); @@ -126,7 +126,6 @@ public class CardValueRecordServiceImpl extends ServiceImpl(cardValueOrders))); + } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @GetMapping("{id}") + public ResponseObject selectOne(@PathVariable Serializable id) { + return getSuccessResult(this.cardValueOrdersService.getById(id)); + } + + /** + * 新增数据 + * + * @param cardValueOrders 实体对象 + * @return 新增结果 + */ + @PostMapping + public ResponseObject insert(@RequestBody CardValueOrders cardValueOrders) { + return getSuccessResult(this.cardValueOrdersService.save(cardValueOrders)); + } + + /** + * 修改数据 + * + * @param cardValueOrders 实体对象 + * @return 修改结果 + */ + @PutMapping + public ResponseObject update(@RequestBody CardValueOrders cardValueOrders) { + return getSuccessResult(this.cardValueOrdersService.updateById(cardValueOrders)); + } + + /** + * 删除数据 + * + * @param idList 主键结合 + * @return 删除结果 + */ + @DeleteMapping + public ResponseObject delete(@RequestParam("idList") List idList) { + return getSuccessResult(this.cardValueOrdersService.removeByIds(idList)); + } +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java new file mode 100644 index 000000000..1e075a6e9 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/entity/CardValueOrders.java @@ -0,0 +1,197 @@ +package com.fuint.business.marketingActivity.cardValueOrders.entity; + +import java.util.Date; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import java.io.Serializable; + +/** + * 储值卡订单表(CardValueOrders)表实体类 + * + * @author makejava + * @since 2023-12-22 15:57:44 + */ +@SuppressWarnings("serial") +public class CardValueOrders extends Model { + //主键id + private Integer id; + //付款用户 + private String payUser; + //支付类型 + private String payType; + //订单号 + private String orderNo; + //所属店铺ID + private Integer storeId; + //用户ID + private Integer userId; + //订单金额 + private Double amount; + //支付金额 + private Double payAmount; + //优惠金额 + private Double discount; + //用户备注 + private String remark; + //订单状态 + private String status; + //支付时间 + private Date payTime; + //推荐员工 + private Integer staffId; + //创建时间 + private Date createTime; + //创建人 + private String createBy; + //更新时间 + private Date updateTime; + //更新人 + private String updateBy; + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getPayUser() { + return payUser; + } + + public void setPayUser(String payUser) { + this.payUser = payUser; + } + + public String getPayType() { + return payType; + } + + public void setPayType(String payType) { + this.payType = payType; + } + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public Integer getStoreId() { + return storeId; + } + + public void setStoreId(Integer storeId) { + this.storeId = storeId; + } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } + + public Double getAmount() { + return amount; + } + + public void setAmount(Double amount) { + this.amount = amount; + } + + public Double getPayAmount() { + return payAmount; + } + + public void setPayAmount(Double payAmount) { + this.payAmount = payAmount; + } + + public Double getDiscount() { + return discount; + } + + public void setDiscount(Double discount) { + this.discount = discount; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public Date getPayTime() { + return payTime; + } + + public void setPayTime(Date payTime) { + this.payTime = payTime; + } + + public Integer getStaffId() { + return staffId; + } + + public void setStaffId(Integer staffId) { + this.staffId = staffId; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getCreateBy() { + return createBy; + } + + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + /** + * 获取主键值 + * + * @return 主键值 + */ + @Override + protected Serializable pkVal() { + return this.id; + } + } + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java new file mode 100644 index 000000000..379e7e494 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/mapper/CardValueOrdersMapper.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.cardValueOrders.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; + +/** + * 储值卡订单表(CardValueOrders)表数据库访问层 + * + * @author makejava + * @since 2023-12-22 15:57:44 + */ +public interface CardValueOrdersMapper extends BaseMapper { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java new file mode 100644 index 000000000..a7ac987cc --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java @@ -0,0 +1,15 @@ +package com.fuint.business.marketingActivity.cardValueOrders.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; + +/** + * 储值卡订单表(CardValueOrders)表服务接口 + * + * @author makejava + * @since 2023-12-22 15:57:44 + */ +public interface CardValueOrdersService extends IService { + +} + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java new file mode 100644 index 000000000..6ab471326 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java @@ -0,0 +1,19 @@ +package com.fuint.business.marketingActivity.cardValueOrders.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.cardValueOrders.mapper.CardValueOrdersMapper; +import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders; +import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService; +import org.springframework.stereotype.Service; + +/** + * 储值卡订单表(CardValueOrders)表服务实现类 + * + * @author makejava + * @since 2023-12-22 15:57:44 + */ +@Service("cardValueOrdersService") +public class CardValueOrdersServiceImpl extends ServiceImpl implements CardValueOrdersService { + +} +