CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改商品购买 

文件下载新增购买校验
master
Diyu0904 2025-03-29 14:55:11 +08:00
parent 54b79c03ca
commit 61d8a0ca88
17 changed files with 149 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelRechargeRecordController.java → mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/ModelPurchaseRecordController.java
View File

@ -1,4 +1,4 @@
package com.mcwl.web.controller.resource;
package com.mcwl.web.controller.pay.AliPay;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
@Api(tags = "商品购买记录")
@RequestMapping("/modelRechargeRecord")
@RestController
public class ModelRechargeRecordController {
public class ModelPurchaseRecordController {
}

17
mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java
View File

@ -7,9 +7,10 @@ import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.R;
import com.mcwl.common.core.page.TableDataInfo;
import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.communityCenter.service.InviteService;
import com.mcwl.myInvitation.domain.Consume;
import com.mcwl.myInvitation.service.ConsumeService;
import com.mcwl.pay.domain.ModelPurchaseRecord;
import com.mcwl.pay.mapper.ModelPurchaseRecordMapper;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ModelVersion;
import com.mcwl.resource.domain.dto.ModelImagePageRes;
@ -48,6 +49,8 @@ import java.util.stream.Collectors;
@RequestMapping("/model")
public class MallProductController extends BaseController {
@Autowired
private ModelPurchaseRecordMapper modelPurchaseRecordMapper;
@Autowired
private ModelService modelService;
@ -163,13 +166,13 @@ public class MallProductController extends BaseController {
R<ModelProduct> modelProductR = modelService.selectModelById(id);
ModelProduct data = modelProductR.getData();
if (Objects.nonNull(data)) {
Consume consume = consumeService.lambdaQuery()
.eq(Consume::getUserId, SecurityUtils.getUserId())
.eq(Consume::getProductId, id)
.eq(Consume::getType, 0)
.one();
LambdaQueryWrapper<ModelPurchaseRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ModelPurchaseRecord::getUserId, SecurityUtils.getUserId())
.eq(ModelPurchaseRecord::getProductId, id)
.eq(ModelPurchaseRecord::getProductType, 0);
ModelPurchaseRecord modelPurchaseRecord = modelPurchaseRecordMapper.selectOne(wrapper);
data.setIsBuy(1);
if (Objects.isNull(consume)) {
if (Objects.isNull(modelPurchaseRecord)) {
data.setIsBuy(0);
}
modelProductR.setData(data);

31
mcwl-common/src/main/java/com/mcwl/common/enums/CommissionRationEnum.java 100644
View File

@ -0,0 +1,31 @@
package com.mcwl.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
/**
* @Author：ChenYan
* @Project：McWl
* @Package：com.mcwl.pay.domain
* @Filename：PaymentStatus
* @Description TODO
* @Date：2025/1/3 17:24
*/
@Getter
@AllArgsConstructor
@NoArgsConstructor
public enum CommissionRationEnum {
/**
* 佣金配给邀请者用户
*/
COMMISSION_RATION_INVITER_USER("CommissionRationInviterUser"),
/**
* 佣金配给商家用户
*/
COMMISSION_RATION_MERCHANT("CommissionRationMerchant");
private String name;
}

33
mcwl-common/src/main/java/com/mcwl/common/enums/PaymentStatus.java 100644
View File

@ -0,0 +1,33 @@
package com.mcwl.common.enums;
/**
* @Author：ChenYan
* @Project：McWl
* @Package：com.mcwl.pay.domain
* @Filename：PaymentStatus
* @Description TODO
* @Date：2025/1/3 17:24
*/
public enum PaymentStatus {
PENDING("待支付"),
COMPLETED("已支付"),
FAILED("支付失败"),
REFUNDED("已退款");
private final String description;
PaymentStatus(String description) {
this.description = description;
}
public String getDescription() {
return description;
}
@Override
public String toString() {
return name() + "(" + description + ")";
}
}

6
mcwl-resource/src/main/java/com/mcwl/resource/mapper/ModelRechargeRecordMapper.java → mcwl-pay/src/main/java/com/mcwl/pay/mapper/ModelPurchaseRecordMapper.java
View File

@ -1,7 +1,7 @@
package com.mcwl.resource.mapper;
package com.mcwl.pay.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mcwl.resource.domain.ModelRechargeRecord;
import com.mcwl.pay.domain.ModelPurchaseRecord;
import org.apache.ibatis.annotations.Mapper;
/**
@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface ModelRechargeRecordMapper extends BaseMapper<ModelRechargeRecord> {
public interface ModelPurchaseRecordMapper extends BaseMapper<ModelPurchaseRecord> {
}

11
mcwl-pay/src/main/java/com/mcwl/pay/service/ModelPurchaseRecordService.java 100644
View File

@ -0,0 +1,11 @@
package com.mcwl.pay.service;
/**
* @author DaiZibo
* @date 2025/3/28
* @apiNote
*/
public interface ModelPurchaseRecordService {
}

18
mcwl-pay/src/main/java/com/mcwl/pay/service/impl/ModelPurchaseRecordServiceImpl.java 100644
View File

@ -0,0 +1,18 @@
package com.mcwl.pay.service.impl;
import com.mcwl.pay.service.ModelPurchaseRecordService;
import org.springframework.stereotype.Service;
/**
* 商品购买记录
*
* @author DaiZibo
* @date 2025/3/28
* @apiNote
*/
@Service
public class ModelPurchaseRecordServiceImpl implements ModelPurchaseRecordService {
}

25
mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
View File

@ -29,11 +29,13 @@ import com.mcwl.myInvitation.domain.Consume;
import com.mcwl.myInvitation.service.CommissionRatioService;
import com.mcwl.myInvitation.service.CommissionService;
import com.mcwl.myInvitation.service.ConsumeService;
import com.mcwl.pay.domain.ModelPurchaseRecord;
import com.mcwl.pay.domain.OrderTrade;
import com.mcwl.pay.domain.enums.CommissionRationEnum;
import com.mcwl.pay.domain.vo.IncomeVo;
import com.mcwl.pay.domain.vo.TrendVo;
import com.mcwl.pay.domain.vo.WalletRechargeRecordVo;
import com.mcwl.pay.mapper.ModelPurchaseRecordMapper;
import com.mcwl.pay.mapper.OrderTradeMapper;
import com.mcwl.pay.service.OrderTradeService;
import com.mcwl.resource.domain.ModelImage;
@ -53,11 +55,8 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
/**
* @Author：ChenYan
@ -81,6 +80,9 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
@Autowired
private CommissionService commissionService;
@Autowired
private ModelPurchaseRecordMapper modelPurchaseRecordMapper;
@Autowired
private ConsumeService consumeService;
@ -147,7 +149,6 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
Double amount = map.get("amount");
// 商品价格
Double price = map.get("price");
// 保存消费表
Consume consume = new Consume();
consume.setUserId(SecurityUtils.getUserId());
@ -157,6 +158,14 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
consume.setConsumeDate(new Date());
consumeService.save(consume);
//添加购买记录表
ModelPurchaseRecord modelPurchaseRecord = ModelPurchaseRecord.builder()
.productId(productId)
.createTime(consume.getCreateTime())
.userId(SecurityUtils.getUserId())
.productType(consume.getType()).build();
modelPurchaseRecordMapper.insert(modelPurchaseRecord);
// 通过sysUser获取邀请人id
if (Objects.isNull(inviterUserId)) {
@ -549,7 +558,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
* @param sysUser 当前用户
* @return Map<String, Double> 模型金额(price) 邀请人提成(amount)
*/
private Map<String, Double> modelOrderHandler(Long productUserId, Long modelId, SysUser sysUser) {
protected Map<String, Double> modelOrderHandler(Long productUserId, Long modelId, SysUser sysUser) {
Consume consume = consumeService.lambdaQuery()
.eq(Consume::getUserId, sysUser.getUserId())
.eq(Consume::getProductId, modelId)
@ -579,7 +588,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
* @param sysUser 当前用户
* @return Map<String, Double> 工作流金额(price) 邀请人提成(amount)
*/
private Map<String, Double> workFlowOrderHandler(Long productUserId, Long workFlowId, SysUser sysUser) {
protected Map<String, Double> workFlowOrderHandler(Long productUserId, Long workFlowId, SysUser sysUser) {
Consume consume = consumeService.lambdaQuery()
.eq(Consume::getUserId, sysUser.getUserId())
@ -612,7 +621,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
* @param sysUser 当前用户
* @return Map<String, Double> 图片金额(price) 邀请人提成(amount)
*/
private Map<String, Double> imageOrderHandler(Long productUserId, Long imageId, SysUser sysUser) {
protected Map<String, Double> imageOrderHandler(Long productUserId, Long imageId, SysUser sysUser) {
Consume consume = consumeService.lambdaQuery()
.eq(Consume::getUserId, sysUser.getUserId())
@ -646,7 +655,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
* @param price 商品价格
* @return Map<String, Double> 商品价格(price) 邀请人提成(amount)
*/
private Map<String, Double> getStringDoubleMap(Long productUserId, SysUser sysUser, Double price) {
protected Map<String, Double> getStringDoubleMap(Long productUserId, SysUser sysUser, Double price) {
Double wallet = sysUser.getWallet();
if (wallet < price) {

1
mcwl-resource/pom.xml
View File

@ -44,6 +44,5 @@
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.2</version>
</dependency>
</dependencies>
</project>

1
mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java
View File

@ -218,5 +218,4 @@ public class ModelVersion extends BaseEntity {
@ApiModelProperty(value = "加密后文件大小")
private String encryptionFileSize;
}

2
mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelRechargeRecord.java → mcwl-resource/src/main/java/com/mcwl/resource/domain/ResponseModelPurchaseRecord.java
View File

@ -21,7 +21,7 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
@Data
public class ModelRechargeRecord {
public class ResponseModelPurchaseRecord {
private Long id;

6
mcwl-resource/src/main/java/com/mcwl/resource/mapper/ModelMapper.java
View File

@ -1,11 +1,10 @@
package com.mcwl.resource.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ResponseModelPurchaseRecord;
import com.mcwl.resource.domain.response.ResponseModelProduct;
import com.mcwl.resource.domain.vo.ModelImageLikeVo;
import com.mcwl.resource.domain.vo.ModelLikeVo;
import com.mcwl.resource.domain.vo.PageVo;
import org.apache.ibatis.annotations.Mapper;
@ -46,4 +45,7 @@ public interface ModelMapper extends BaseMapper<ModelProduct> {
List<ModelLikeVo> selectLikedModelsByUser(@Param("page") Page<ModelLikeVo> page,
@Param("userId") Long userId,
@Param("orderByColumn") String orderByColumn);
ResponseModelPurchaseRecord selectIsBuy(@Param("id") Long id, @Param("userId") Long userId);
}

10
mcwl-resource/src/main/java/com/mcwl/resource/service/ModelRechargeRecordService.java
View File

@ -1,10 +0,0 @@
package com.mcwl.resource.service;
/**
* @author DaiZibo
* @date 2025/3/28
* @apiNote
*/
public interface ModelRechargeRecordService {
}

24
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelRechargeRecordServiceImpl.java
View File

@ -1,24 +0,0 @@
package com.mcwl.resource.service.impl;
import com.mcwl.resource.mapper.ModelRechargeRecordMapper;
import com.mcwl.resource.service.ModelRechargeRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* 商品购买记录
*
* @author DaiZibo
* @date 2025/3/28
* @apiNote
*/
@Service
public class ModelRechargeRecordServiceImpl implements ModelRechargeRecordService {
@Autowired
private ModelRechargeRecordMapper rechargeRecordMapper;
}

15
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java
View File

@ -77,6 +77,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
@Autowired
private CollectServiceImpl collectService;
@Value("${mcwl.encryptUrl}")
private String encryptUrl;
@ -575,20 +576,6 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper,ModelProduct> impl
modelProduct.setCategory(DictInit.getDictValue(DictConstants.MODEL_CHILD_CATEGORY,modelProduct.getCategory()));
}
//标签
// if (StringUtils.isNotEmpty(modelProduct.getTags())){
// ArrayList<String> strings = new ArrayList<>();
// String[] split = modelProduct.getTags().split(",");
// for (String s : split) {
// if (s != ""){
// strings.add(s);
// }
// }
// modelProduct.setStyleList(strings);
// }
// modelProduct.setStyleList(new ArrayList<>());
//功能
if (StringUtils.isNotEmpty(modelProduct.getFunctions())){
modelProduct.setCategory(DictInit.getDictValue(DictConstants.WORK_FLOW_FUNCTIONS,modelProduct.getFunctions()));

16
mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelVersionServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.mcwl.common.utils.SecurityUtils;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.resource.domain.Collect;
import com.mcwl.resource.domain.ModelProduct;
import com.mcwl.resource.domain.ResponseModelPurchaseRecord;
import com.mcwl.resource.domain.ModelVersion;
import com.mcwl.resource.mapper.ModelMapper;
import com.mcwl.resource.mapper.ModelVersionMapper;
@ -40,9 +41,6 @@ public class ModelVersionServiceImpl extends ServiceImpl< ModelVersionMapper,Mo
@Autowired
private ModelMapper modelMapper;
@Autowired
private ModelVersionMapper modelVersionMapper;
@ -141,11 +139,17 @@ public class ModelVersionServiceImpl extends ServiceImpl< ModelVersionMapper,Mo
return R.fail(HttpStatus.SHOW_ERROR_MSG,"此文件不可下载");
}
//校验是否购收费/购买
//查询主表信息
ModelProduct modelProduct = modelMapper.selectById(modelVersion.getModelId());
if (modelProduct.getIsFree() == 0){
//校验是否收费
ResponseModelPurchaseRecord modelPurchaseRecord = modelMapper.selectIsBuy(modelProduct.getId(),SecurityUtils.getUserId());
if (StringUtils.isNull(modelPurchaseRecord)){
//校验是否是自己的
if (!SecurityUtils.getUserId().equals(modelProduct.getUserId())){
return R.fail(HttpStatus.SHOW_ERROR_MSG,"请先购买");
}
}
}
if (modelVersion.getIsEncrypt() == 1){

8
mcwl-resource/src/main/resources/mapper/resource/ModelMapper.xml
View File

@ -147,4 +147,12 @@
desc
</select>
<select id="selectIsBuy" resultType="com.mcwl.resource.domain.ResponseModelPurchaseRecord">
SELECT id,product_id,product_type,user_id
FROM model_purchase_record
WHERE product_id = #{id}
and user_id = #{userId}
and product_type= 0
</select>
</mapper>