diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java index 10186cae7..2ed990244 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.api.ApiController; import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.cardCoupon.dto.CardCouponUserDto; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser; import com.fuint.business.marketingActivity.cardCoupon.service.CardCouponUserService; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUserVo; @@ -129,8 +130,8 @@ public class CardCouponUserController extends BaseController { * 分页查询已核销记录列表 */ @GetMapping("/selectVerifiedList") - public ResponseObject selectVerifiedList(Page page,CardCouponUser cardCouponUser) { - return getSuccessResult(this.cardCouponUserService.selectVerifiedList(page, cardCouponUser)); + public ResponseObject selectVerifiedList(Page page, CardCouponUserDto cardCouponUserDto) { + return getSuccessResult(this.cardCouponUserService.selectVerifiedList(page, cardCouponUserDto)); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/dto/CardCouponUserDto.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/dto/CardCouponUserDto.java new file mode 100644 index 000000000..09d9ae75e --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/dto/CardCouponUserDto.java @@ -0,0 +1,62 @@ +package com.fuint.business.marketingActivity.cardCoupon.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class CardCouponUserDto { + + //主键id + @TableId(type = IdType.AUTO) + private Integer id; + //所属连锁店id + private Integer chainStoreId; + //所属店铺id + private Integer storeId; + //会员id + private Integer mtUserId; + //会员手机号码 + private String mobile; + //来源类型 1储值卡2囤油卡 3消费有礼赠送4收银台赠送 + private String fromType; + //活动id + private Integer activeId; + //优惠券id + private Integer cardCouponId; + //0未使用1已核销 + private String status; + //使用时间 + private Date useTime; + //订单总表all order 的主键 + private Integer orderId; + //创建者 + private String createBy; + //创建时间 + private Date createTime; + //更新者 + private String updateBy; + //更新时间 + private Date updateTime; + //核销码 + private String verificationCode; + + /** + * 优惠券名称 + */ + private String name; + /** + * 优惠券类型 + */ + private String type; + + + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") + private String begin; + + @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") + private String end; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java index 3495c9c41..b787e414d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/entity/CardCouponUser.java @@ -60,23 +60,5 @@ public class CardCouponUser extends Model { //核销码 private String verificationCode; - /** - * 优惠券名称 - */ - @Transient - private String name; - /** - * 优惠券类型 - */ - @Transient - private String type; - - @Transient - @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") - private String begin; - @Transient - @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8") - private String end; - } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java index 45a55c0ed..5b1d1bce6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/mapper/CardCouponUserMapper.java @@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardCoupon.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.marketingActivity.cardCoupon.dto.CardCouponUserDto; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUniVo; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUserVo; @@ -51,7 +52,6 @@ public interface CardCouponUserMapper extends BaseMapper { CardCouponUserVo selectOneCardName(Integer id); - - IPage selectVerifiedList(Page page, @Param("obj")CardCouponUser cardCouponUser); + IPage selectVerifiedList(Page page, @Param("obj") CardCouponUserDto cardCouponUserDto); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java index 8261fea31..51129fc64 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java @@ -4,6 +4,7 @@ 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.marketingActivity.activeApplet.entity.ActiveApplet; +import com.fuint.business.marketingActivity.cardCoupon.dto.CardCouponUserDto; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponUserVo; import com.fuint.business.marketingActivity.cardCoupon.vo.CardCouponVO; @@ -70,6 +71,6 @@ public interface CardCouponUserService extends IService { List> selectUserCardVerification(String str); - IPage selectVerifiedList(Page page, CardCouponUser cardCouponUser); + IPage selectVerifiedList(Page page, CardCouponUserDto cardCouponUserDto); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java index 4aa011a5b..b9377e123 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.marketingActivity.cardCoupon.dto.CardCouponUserDto; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCoupon; import com.fuint.business.marketingActivity.cardCoupon.mapper.CardCouponUserMapper; import com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser; @@ -195,8 +196,8 @@ public class CardCouponUserServiceImpl extends ServiceImpl selectVerifiedList(Page page, CardCouponUser cardCouponUser) { - return cardCouponUserMapper.selectVerifiedList(page, cardCouponUser); + public IPage selectVerifiedList(Page page, CardCouponUserDto cardCouponUserDto) { + return cardCouponUserMapper.selectVerifiedList(page, cardCouponUserDto); } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java index f3b1ea9dd..fa2777eb2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java @@ -2,7 +2,9 @@ package com.fuint.business.marketingActivity.cardFule.entity; import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; import com.fuint.repository.model.base.BaseEntity; import lombok.Data; @@ -19,6 +21,7 @@ public class CardFuelChange extends BaseEntity { /** * 主键id */ + @TableId(value = "ID", type = IdType.AUTO) private Integer id; /** * 用户id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml index 09244005b..3d284a359 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml @@ -273,7 +273,8 @@ FROM card_value_record - store_id = #{cardValueRecord.storeId} + pay_status = 'paid' + and store_id = #{cardValueRecord.storeId} and mt_staff_id = #{cardValueRecord.mtStaffId} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java index 8a09fa24a..d1516a721 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java @@ -113,4 +113,10 @@ public interface CardValueRecordService extends IService { * @return */ List getCardValueByCardValueId(CardValueConditionVo cardValueConditionVo); + /** + * 会员充值总人数 + * @param user + * @return + */ + Integer selectUserTotal1(LJUserVo user); } 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 bcbf7fef2..c12c98df3 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 @@ -524,9 +524,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl userList = ljUserMapper.findUserList(user); + List userIds = new ArrayList<>(); + for (LJUserVo userVo : userList) { + userIds.add(userVo.getId()); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + if (ObjectUtil.isNotEmpty(user.getParams())){ + queryWrapper.apply(true,"create_time BETWEEN '" + user.getParams().get("beginTime") + "' and '" + user.getParams().get("endTime") + "'"); + } + if (CollectionUtil.isNotEmpty(userIds)){ + queryWrapper.eq("chain_store_id",user.getChainStoreId()); + queryWrapper.in("mt_user_id",userIds); + queryWrapper.groupBy("mt_user_id"); + List list = baseMapper.selectList(queryWrapper); + return list.size(); + } + return 0; + } } 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 index 181b55d86..992d5e691 100644 --- 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 @@ -8,7 +8,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fuint.framework.entity.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -22,6 +24,8 @@ import java.util.List; * @since 2023-11-07 15:10:07 */ @Data +@NoArgsConstructor +@AllArgsConstructor @TableName("oil_order") @ApiModel(value = "OilOrder对象", description = "油品订单表") public class OilOrder extends BaseEntity implements Serializable { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml index c5c8c4c98..0682b4b28 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml @@ -208,7 +208,8 @@ SELECT count(*) numberOfProducts,-- 商品笔数 - sum( pay_amount ) theTotalAmount,-- 总金额 + sum( amount ) theTotalAmount,-- 总金额 + sum( pay_amount ) theTotalPayAmount,-- 实付总金额 sum( goods_num ) theTotalNumberOfUnits,-- 商品总数量 sum( discount ) discountAmount,-- 优惠金额 sum( CASE WHEN pay_type = 'WECHAT' THEN pay_amount END ) AS wechat,-- 微信 @@ -218,7 +219,8 @@ from mt_order - store_id = #{order.storeId} + status = 'paid' + and store_id = #{order.storeId} and staff_id = #{order.staffId} 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 index 236e9768c..f854a1822 100644 --- 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 @@ -543,7 +543,9 @@ sum(CASE WHEN pay_type = 'WECHAT' THEN pay_amount END) AS wechat, sum(CASE WHEN pay_type = 'ALIPAY' THEN pay_amount END) AS alipay, sum(CASE WHEN pay_type = 'CASH' THEN pay_amount END) AS cash, - sum( CASE WHEN pay_type = 'UNIONPAY' THEN pay_amount END ) AS UNIONPAY + sum( CASE WHEN pay_type = 'UNIONPAY' THEN pay_amount END ) AS UNIONPAY, + sum( CASE WHEN pay_type = 'fule_card' THEN pay_amount END ) AS fuleCard, + sum( CASE WHEN pay_type = 'card_value' THEN pay_amount END ) AS cardValue from oil_order store_id = #{order.storeId} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 87538bae4..cf0083191 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -67,8 +67,10 @@ import com.fuint.common.dto.AccountInfo; import com.fuint.common.service.MemberService; import com.fuint.common.service.StaffService; import com.fuint.common.util.TokenUtil; +import com.fuint.repository.mapper.MtOrderMapper; import com.fuint.repository.mapper.MtStaffMapper; import com.fuint.repository.mapper.MtUserMapper; +import com.fuint.repository.model.MtOrder; import com.fuint.repository.model.MtStaff; import com.fuint.repository.model.MtUser; import com.fuint.repository.model.TAccount; @@ -139,6 +141,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl orderStatistics(AllOrderInfoRes allOrderInfoRes) { return allOrderInfoMapper.orderStatistics(allOrderInfoRes, allOrderInfoRes.getDataRange() == null ? "" : allOrderInfoRes.getDataRange()[0], @@ -573,6 +578,10 @@ public class AllOrderInfoServiceImpl extends ServiceImpl q6 = Wrappers.query(); q6.eq("order_no", cashierOrder.getOrderNo()); + q6.eq("change_type", "1"); CardBalanceChange cardBalanceChange = cardBalanceChangeMapper.selectOne(q6); - userBalance.setCardBalance(userBalance.getCardBalance() + cardBalanceChange.getBalance()); + userBalance.setCardBalance(cardBalanceChange.getAfterTheChange()); userBalanceMapper.updateById(userBalance); } 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 index 91c3b6747..f76d3bf76 100644 --- 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 @@ -578,10 +578,15 @@ public class OilOrderServiceImpl extends ServiceImpl i ljOrder.setUserId(userId); ljOrder.setAmount(goodsAmount); ljOrder.setPayAmount(goodsActualPay); + ljOrder.setDiscount(goodsDiscount); + if (payUser.equals("散客")){ + ljOrder.setAmount(goodsAmount); + ljOrder.setPayAmount(goodsAmount); + ljOrder.setDiscount(0.0); + } ljOrder.setGoodsNum(Integer.valueOf(map.get("goodsNum"))); ljOrder.setUsePoint(usePoint); ljOrder.setPointAmount(pointAmount); - ljOrder.setDiscount(goodsDiscount); ljOrder.setStaffId(staffId); ljOrder.setStatus(payStatus); if (ObjectUtil.isNotEmpty(couponType) && couponType.equals("5")) ljOrder.setCouponUserId(couponUserId); @@ -703,6 +708,12 @@ public class OilOrderServiceImpl extends ServiceImpl i cashierOrder.setTerminal(terminal); cashierOrder.setPayType(payType); cashierOrder.setAfterDiscountAmount(oilAmount + goodsAmount - oilDiscount - goodsDiscount); + if (payUser.equals("散客")){ + cashierOrder.setGoodsOrderAmount(goodsAmount); + cashierOrder.setGoodsPayAmount(goodsAmount); + cashierOrder.setGoodsDiscountAmount(0.0); + cashierOrder.setAfterDiscountAmount(goodsAmount); + } // 如果金额不等于0调用第三方支付接口 if (!map.get("allAmount").equals("0") && !map.get("payType").equals("CASH") && !payType.equals("after_pay") 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 3b50756df..c6f69d87b 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 @@ -110,4 +110,6 @@ public interface LJUserMapper extends BaseMapper { * @return */ Integer selectUserCountByChainStoreId(@Param("chainStoreId") Integer chainStoreId); + + List findUserList(@Param("user") LJUserVo user); } 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 e13a59524..02d6be572 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 @@ -418,4 +418,32 @@ mub.store_id = #{storeId} and mub.user_status = '0' + + 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 56335a425..61ccd7044 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 @@ -292,7 +292,7 @@ public class LJUserServiceImpl extends ServiceImpl impleme // Integer yesterdayAddNum = baseMapper.selectCount(queryWrapper1); Integer yesterdayAddNum = userBalanceMapper.selectCount(queryWrapper1); - Integer rechargeTotal = cardValueRecordService.selectUserTotal(user); + Integer rechargeTotal = cardValueRecordService.selectUserTotal1(user); map.put("balance",balance); map.put("point",point); // map.put("literCard",literCard); diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtOrderMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtOrderMapper.java index 8ba329097..f7cf6917d 100644 --- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtOrderMapper.java +++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtOrderMapper.java @@ -3,6 +3,8 @@ package com.fuint.repository.mapper; import com.fuint.repository.model.MtOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + import java.math.BigDecimal; import java.util.Date; @@ -40,4 +42,8 @@ public interface MtOrderMapper extends BaseMapper { Integer getUserPayOrderCount(@Param("userId") Integer userId); + void updateStatusById(@Param("id")Integer goodsOrderId); + + @Select("select * from mt_order where order_no = #{orderNo}") + MtOrder selectByOrderNo(String orderNo); } diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/MtOrderMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/MtOrderMapper.xml index 0b754c3c4..723395bad 100644 --- a/fuintBackend/fuint-repository/src/main/resources/mapper/MtOrderMapper.xml +++ b/fuintBackend/fuint-repository/src/main/resources/mapper/MtOrderMapper.xml @@ -64,4 +64,10 @@ + + + update mt_order + set status = 'refund' + where id = #{id} + diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index 484d8f747..bd01567cc 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -95,20 +95,20 @@
- {{ orderStatistics.s7 || 0 }}/{{ orderStatistics.s6 || 0 }} + {{ orderStatistics.s6 || 0 }}
-
油品订单/实付总金额（元）
+
油品订单实付总金额（元）
- {{ orderStatistics.s9 || 0 }}/{{ orderStatistics.s8 || 0 }} + {{ orderStatistics.s8 || 0 }}
-
商品订单/实付总金额（元）
+
商品订单实付总金额（元）
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue index 9a2e6ab82..3b48dd87b 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue @@ -51,14 +51,23 @@ /> - + + + + + + + + + +
- {{ orderStatistics.theTotalAmount || 0 }} + {{ orderStatistics.theTotalPayAmount || 0 }}
@@ -175,9 +184,9 @@ @@ -388,6 +397,10 @@ export default { queryParams: { page: 1, pageSize: 10, + orderNo: '', + terminal: '', + payType: '', + status: '' }, orderGoods: '', // 支付列表 diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue index d29f9a19a..2bf043d3b 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue @@ -159,7 +159,7 @@
- {{ orderStatistics.wechat || 0 }}/{{ orderStatistics.alipay || 0 }} + {{ orderStatistics.cardValue || 0 }}/{{ orderStatistics.fuleCard || 0 }}
@@ -218,10 +218,9 @@ diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue index 3541f2b66..1a83ffe21 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue @@ -71,7 +71,7 @@
- {{ orderStatistics.totalAmountReceived || 0 }}/{{ orderStatistics.numberOfTopUps || 0 }} + {{ orderStatistics.theTotalAmountOfTopUp || 0 }}/{{ orderStatistics.numberOfTopUps || 0 }}
@@ -80,7 +80,7 @@
- {{ orderStatistics.theTotalAmountOfTopUp || 0 }} + {{ orderStatistics.totalAmountReceived || 0 }}
@@ -146,7 +146,7 @@ - +