ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/CustomConfig.java
@@ -1,6 +1,7 @@ package com.ruoyi.system.api.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -33,24 +34,31 @@ private Integer configId; @ApiModelProperty(value = "删除标记") @TableField(value = "del_flag") private Integer delFlag; @ApiModelProperty(value = "配置类型") @TableField(value = "config_type") private Integer configType; @ApiModelProperty(value = "配置键") @TableField("config_key") private String configKey; @ApiModelProperty(value = "配置名") @TableField(value = "config_name") private String configName; @ApiModelProperty(value = "配置值") @TableField(value = "config_value") private String configValue; @ApiModelProperty(value = "创建时间") @TableField(value = "create_time") private LocalDateTime createTime; @ApiModelProperty(value = "更新时间") @TableField(value = "update_time") private LocalDateTime updateTime;
@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; import lombok.Data; import lombok.EqualsAndHashCode; @@ -108,4 +109,8 @@ @ApiModelProperty(value = "后台对应id") private Long userId; @ApiModelProperty(value = "用户消费金额") private BigDecimal money; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberAddress.java
@@ -70,7 +70,7 @@ @TableLogic private Integer delFlag; @ApiModelProperty(value = "是否默认") @ApiModelProperty(value = "是否默认 1是其他，2 是默认") private Integer isDefault; @ApiModelProperty(value = "省份/直辖市") ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/MemberPoints.java
File was renamed from ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/MemberPoints.java @@ -1,4 +1,4 @@ package com.ruoyi.member.domain; package com.ruoyi.system.api.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/CustomConfigDTO.java
New file @@ -0,0 +1,12 @@ package com.ruoyi.system.api.domain.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "获取配置对象", description = "优惠卷对象") public class CustomConfigDTO { @ApiModelProperty(value = "1 客服电话，2 商城订单说明配置，3 退货周期，用户在收货后{}天可申请售后") private Integer type; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/MemberPointsDTO.java
New file @@ -0,0 +1,21 @@ package com.ruoyi.system.api.domain.dto; import com.ruoyi.common.core.enums.PointStatusEnum; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data public class MemberPointsDTO { @ApiModelProperty(value = "积分") private Integer points; @ApiModelProperty(value = "积分类型 1支付订单") private Integer pointsType; @ApiModelProperty(value = "积分状态 1是加积分，2 是减积分") private PointStatusEnum pointsStatus; @ApiModelProperty(value = "会员id") private Long memberId; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/OrderDTO.java
@@ -69,4 +69,9 @@ @ApiModelProperty(value = "商品价格") private BigDecimal price; @ApiModelProperty(value = "积分") private Integer points; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/AuctionFallbackFactory.java
@@ -4,9 +4,14 @@ import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.AuctionGoods; import com.ruoyi.system.api.domain.AuctionSalesroom; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO; import com.ruoyi.system.api.domain.dto.BondDTO; import com.ruoyi.system.api.feignClient.AuctionClient; import org.springframework.cloud.openfeign.FallbackFactory; import java.util.List; /** * @author mitao @@ -42,6 +47,15 @@ public R<AppMiniLoginVO> actionMiniLogin(AppMiniLoginDTO appMiniLoginDto) { return R.fail("登录失败" + cause.getMessage()); } @Override public R<?> UpdateBond(BondDTO BondVO, String source) { return R.fail("修改保证金支付状态失败" + cause.getMessage()); } @Override public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(AuctionGoodsListDTO auctionGoodsListDTO, String source) { return R.fail("普通拍卖获取保证金失败" + cause.getMessage()); } }; } } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/MemberFallbackFactory.java
@@ -6,6 +6,7 @@ import com.ruoyi.system.api.domain.MemberAddress; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO; import com.ruoyi.system.api.domain.dto.MemberPointsDTO; import com.ruoyi.system.api.feignClient.MemberClient; import java.util.List; import java.util.Set; @@ -46,6 +47,11 @@ public R<AppMiniLoginVO> miniRegister(AppMiniRegisterDTO appUserRegisterDto) { return R.fail("注册用户失败:" + cause.getMessage()); } @Override public R<?> addMemberPoints(MemberPointsDTO memberPointsDTO) { return R.fail("添加用户积分失败:" + cause.getMessage()); } }; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -107,15 +107,7 @@ return R.fail("生成保证金失败" + cause.getMessage()); } @Override public R<?> UpdateBond(BondDTO BondVO, String source) { return R.fail("修改保证金支付状态失败" + cause.getMessage()); } @Override public R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(AuctionGoodsListDTO auctionGoodsListDTO, String source) { return R.fail("普通拍卖获取保证金失败" + cause.getMessage()); } }; } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/AuctionClient.java
@@ -6,7 +6,10 @@ import com.ruoyi.system.api.domain.AppMiniLoginVO; import com.ruoyi.system.api.domain.AuctionGoods; import com.ruoyi.system.api.domain.AuctionSalesroom; import com.ruoyi.system.api.domain.OrderAuctionBond; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO; import com.ruoyi.system.api.domain.dto.BondDTO; import com.ruoyi.system.api.factory.AuctionFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; @@ -14,6 +17,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import java.util.List; @FeignClient(contextId = "auctionClient", value = ServiceNameConstants.RUOYI_AUCTION, fallbackFactory = AuctionFallbackFactory.class) public interface AuctionClient { @@ -35,4 +40,11 @@ @PostMapping("/forepart/auction-salesroom/actionMiniLogin") R<AppMiniLoginVO> actionMiniLogin(@RequestBody AppMiniLoginDTO appMiniLoginDto); @PostMapping("/order-auction-bond/UpdateBond") R<?> UpdateBond(@RequestBody BondDTO BondVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PostMapping("/order-auction-bond/getAuctionGoodsOrderAuctionBondList") R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/MemberClient.java
@@ -8,9 +8,12 @@ import com.ruoyi.system.api.domain.MemberAddress; import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO; import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO; import com.ruoyi.system.api.domain.dto.MemberPointsDTO; import com.ruoyi.system.api.factory.MemberFallbackFactory; import java.util.List; import java.util.Set; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -40,4 +43,8 @@ @PostMapping("/forepart/member/miniRegister") public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appUserRegisterDto); @PostMapping("/member-points/addMemberPoints") R<?> addMemberPoints(@RequestBody MemberPointsDTO memberPointsDTO); } ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/OrderClient.java
@@ -137,10 +137,5 @@ R<PayInfoVO> SaveOrderAuctionBond(@RequestBody MemberAuctionSalesroomBondDTO memberAuctionSalesroomBondDTO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PostMapping("/order-auction-bond/UpdateBond") R<?> UpdateBond(@RequestBody BondDTO BondVO, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); @PostMapping("/order-auction-bond/getAuctionGoodsOrderAuctionBondList") R<List<OrderAuctionBond>> getAuctionGoodsOrderAuctionBondList(@RequestBody AuctionGoodsListDTO auctionGoodsListDTO,@RequestHeader(SecurityConstants.FROM_SOURCE) String source); } ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; import com.ruoyi.system.api.domain.*; import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsDTO; import com.ruoyi.system.api.domain.dto.AuctionSalesroomGoodsInfoDTO; import com.ruoyi.system.api.domain.vo.AuctionBidRecordVO; @@ -26,14 +27,6 @@ import com.ruoyi.common.core.enums.AuctionStartStatusEnum; import com.ruoyi.common.core.enums.BidStatusEnum; import com.ruoyi.common.core.enums.OrderFromEnum; import com.ruoyi.system.api.domain.AuctionSalesroom; import com.ruoyi.system.api.domain.GoodsBrand; import com.ruoyi.system.api.domain.GoodsCategory; import com.ruoyi.system.api.domain.GoodsFlavorType; import com.ruoyi.system.api.domain.GoodsSeries; import com.ruoyi.system.api.domain.GoodsSku; import com.ruoyi.system.api.domain.Member; import com.ruoyi.system.api.domain.MemberAddress; import com.ruoyi.system.api.domain.dto.GoodsStockUpdDTO; import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO; import com.ruoyi.system.api.domain.dto.OrderDTO; @@ -46,6 +39,8 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Resource; import com.ruoyi.system.api.feignClient.SysUserClient; import org.springframework.stereotype.Service; /** @@ -72,6 +67,9 @@ @Resource private OrderClient orderClient; @Resource private SysUserClient sysUserClient; @Resource @@ -561,6 +559,15 @@ R<MemberAddress> memberAddressR = emberClient.getMemberAddressOne(memberId, SecurityConstants.INNER); MemberAddress memberAddress=memberAddressR.getData(); CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData(); CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData(); Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue()); BigDecimal pi=lastBidAmount.multiply(new BigDecimal(aDouble)); order.setPoints(pi.intValue()); order.setReceiverCity(memberAddress.getCity()); order.setReceiverDetailAddress(memberAddress.getDetailedAddress()); order.setReceiverphone(memberAddress.getRecipientPhone()); ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsSkuController.java
@@ -40,7 +40,7 @@ @InnerAuth @PostMapping("/getGoodsSkuOne") @ResponseBody public R<GoodsSku> getGoodsSkuOne(@RequestBody Integer goodsSkuId) { public R<GoodsSku> getGoodsSkuOne(@RequestBody Long goodsSkuId) { GoodsSku goodsSkuOne=iGoodsSkuService.getById(goodsSkuId); return R.ok(goodsSkuOne);
@@ -49,11 +49,15 @@ if (memberInvoiceRise==null){ memberInvoiceRise=new MemberInvoiceRise(); } LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery(); wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper.eq(MemberInvoiceRise::getDelFlag,0); wrapper.eq(MemberInvoiceRise::getIsDefault,2); MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper); if (memberInvoiceRiseDTO.getIsDefault()==2){ LambdaQueryWrapper<MemberInvoiceRise> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper1.eq(MemberInvoiceRise::getDelFlag,0); wrapper1.eq(MemberInvoiceRise::getIsDefault,2); MemberInvoiceRise memberInvoiceRise2= this.getOne(wrapper1); memberInvoiceRise2.setIsDefault(1); this.updateById(memberInvoiceRise2); } memberInvoiceRise.setInvoiceType(memberInvoiceRiseDTO.getInvoiceType()); memberInvoiceRise.setRiseType(memberInvoiceRiseDTO.getRiseType()); @@ -63,22 +67,33 @@ memberInvoiceRise.setCorporationAccount(memberInvoiceRiseDTO.getCorporationAccount()); memberInvoiceRise.setCorporationOpen(memberInvoiceRiseDTO.getCorporationOpen()); memberInvoiceRise.setCorporationPhone(memberInvoiceRiseDTO.getCorporationPhone()); memberInvoiceRise.setIsDefault(memberInvoiceRiseDTO.getIsDefault()); if (memberInvoiceRise1==null){ memberInvoiceRise.setIsDefault(2); } this.saveOrUpdate(memberInvoiceRise); } @Override public void saveIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) { LambdaQueryWrapper<MemberInvoiceRise> wrapper= Wrappers.lambdaQuery(); wrapper.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper.eq(MemberInvoiceRise::getDelFlag,0); wrapper.eq(MemberInvoiceRise::getIsDefault,2); MemberInvoiceRise memberInvoiceRise1= this.getOne(wrapper); memberInvoiceRise1.setIsDefault(1); this.updateById(memberInvoiceRise1); if (memberInvoiceRise1==null){ memberInvoiceRise.setIsDefault(2); } } @Override public void saveIsDefault(MemberInvoiceRiseDTO memberInvoiceRiseDTO) { LambdaQueryWrapper<MemberInvoiceRise> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(MemberInvoiceRise::getMemberId,memberInvoiceRiseDTO.getMemberId()); wrapper1.eq(MemberInvoiceRise::getDelFlag,0); wrapper1.eq(MemberInvoiceRise::getIsDefault,2); MemberInvoiceRise memberInvoiceRise2= this.getOne(wrapper1); memberInvoiceRise2.setIsDefault(1); this.updateById(memberInvoiceRise2); MemberInvoiceRise memberInvoiceRise=this.getById(memberInvoiceRiseDTO.getId()); memberInvoiceRise.setIsDefault(2); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -101,6 +101,7 @@ order.setMemberId(OrderDTO.getMemberId()); order.setTotalAmount(OrderDTO.getTotalAmount()); order.setOrderStatus(OrderStatusEnum.TO_PLAY); order.setPoints(OrderDTO.getPoints()); order.setGoodsQuantity(OrderDTO.getGoodsQuantity()); order.setReceiverName(OrderDTO.getReceiverName()); order.setReceiverphone(OrderDTO.getReceiverphone()); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -9,12 +9,16 @@ import com.alipay.api.response.AlipayTradeRefundResponse; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.enums.OrderStatusEnum; import com.ruoyi.common.core.enums.PointStatusEnum; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.order.domain.Paylog; import com.ruoyi.order.mapper.PaylogMapper; import com.ruoyi.order.service.IOrderService; import com.ruoyi.order.service.IPaylogService; import com.ruoyi.order.util.SinataUtil; import com.ruoyi.order.util.alipay.config.AlipayConfig; @@ -24,8 +28,12 @@ import com.ruoyi.order.util.tencent.common.XMLParser; import com.ruoyi.order.util.tencent.protocol.AppPayReqData; import com.ruoyi.order.util.tencent.protocol.UnifiedorderReqData; import com.ruoyi.system.api.domain.Order; import com.ruoyi.system.api.domain.dto.BondDTO; import com.ruoyi.system.api.domain.dto.MemberPointsDTO; import com.ruoyi.system.api.domain.dto.RefundDTO; import com.ruoyi.system.api.feignClient.AuctionClient; import com.ruoyi.system.api.feignClient.MemberClient; import com.ruoyi.system.api.feignClient.OrderClient; import java.io.IOException; import java.io.PrintWriter; @@ -61,7 +69,12 @@ @Resource private OrderClient orderClient; private IOrderService iOrderService; @Resource private AuctionClient auctionClient; @Resource private MemberClient memberClient; @Override public R<Map<String, Object>> getPayInfo(Integer uid, Integer type, String subject, String body, String orderNO,String openId, HttpServletRequest request) { @@ -131,12 +144,23 @@ Paylog one = this.getOne(wrapper); if(SinataUtil.isEmpty(one)) { this.save(paylog1); if (paylog1.getOutTradeNo().contains("BO")) { BondDTO bondVO=new BondDTO(); bondVO.setOrderNO(paylog1.getOutTradeNo()); orderClient.UpdateBond(bondVO, SecurityConstants.INNER); auctionClient.UpdateBond(bondVO, SecurityConstants.INNER); } LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(Order::getOrderNo,paylog1.getOutTradeNo()); wrapper1.eq(Order::getDelFlag,0); Order page1 = iOrderService.getOne(wrapper1); page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED); iOrderService.updateById(page1); MemberPointsDTO memberPointsDTO=new MemberPointsDTO(); memberPointsDTO.setMemberId(page1.getMemberId()); memberPointsDTO.setPointsType(1); memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE); memberPointsDTO.setPoints(page1.getPoints()); memberClient.addMemberPoints(memberPointsDTO); } @@ -226,12 +250,24 @@ System.out.println("支付完成时间" + time_end); paylog.setAddTime(LocalDateTime.now()); this.save(paylog); if (paylog.getOutTradeNo().contains("BO")) { BondDTO bondVO=new BondDTO(); bondVO.setOrderNO(paylog.getOutTradeNo()); orderClient.UpdateBond(bondVO, SecurityConstants.INNER); BondDTO bondVO=new BondDTO(); } bondVO.setOrderNO(paylog.getOutTradeNo()); auctionClient.UpdateBond(bondVO, SecurityConstants.INNER); LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo()); wrapper1.eq(Order::getDelFlag,0); Order page1 = iOrderService.getOne(wrapper1); page1.setOrderStatus(OrderStatusEnum.GOODS_TO_BE_RECEIVED); iOrderService.updateById(page1); MemberPointsDTO memberPointsDTO=new MemberPointsDTO(); memberPointsDTO.setMemberId(page1.getMemberId()); memberPointsDTO.setPointsType(1); memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE); memberPointsDTO.setPoints(page1.getPoints()); memberClient.addMemberPoints(memberPointsDTO); log.debug("WxpayController.notify__回调处理成功：SUCCESS");
