cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
moxiangrong
2024-03-05 14:38:24 +08:00
parent 09d4fd81c5
commit 912be34a6e
17 changed files with 70 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yshop-module-mall/yshop-module-distributor-biz/src/main/java/co/yixiang/yshop/module/distributor/service/distributorwageslog/DistributorWagesLogFacadeImpl.java
View File

@ -47,6 +47,7 @@ public class DistributorWagesLogFacadeImpl implements DistributorWagesLogFacade
increaseNowMoneyDTO.setId(wagesLog.getUserId());
increaseNowMoneyDTO.setAmount(wagesLog.getAmount());
increaseNowMoneyDTO.setLink(wagesLog.getId().toString());
increaseNowMoneyDTO.setTitle("佣金提现");
increaseNowMoneyDTO.setMark("佣金提现" + increaseNowMoneyDTO.getAmount() + "元");
memberUserNowMoneyApi.increaseNowMoney(increaseNowMoneyDTO);
}

2
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/api/RechargeOrderApiImpl.java
View File

@ -48,6 +48,7 @@ public class RechargeOrderApiImpl implements RechargeOrderApi {
increaseNowMoneyDTO.setId(rechargeOrder.getUserId());
increaseNowMoneyDTO.setAmount(new BigDecimal(rechargeOrder.getRechargeAmount()));
increaseNowMoneyDTO.setLink(orderId);
increaseNowMoneyDTO.setTitle("充值");
increaseNowMoneyDTO.setMark("微信支付充值" + rechargeOrder.getRechargeAmount() + "元");
memberUserNowMoneyApi.increaseNowMoney(increaseNowMoneyDTO);
@ -57,6 +58,7 @@ public class RechargeOrderApiImpl implements RechargeOrderApi {
increaseNowMoneyDTO.setId(rechargeOrder.getUserId());
increaseNowMoneyDTO.setAmount(new BigDecimal(rechargeOrder.getGiftAmount()));
increaseNowMoneyDTO.setLink(orderId);
increaseNowMoneyDTO.setTitle("充值赠送");
increaseNowMoneyDTO.setMark("充值赠送" + rechargeOrder.getGiftAmount() + "元");
memberUserNowMoneyApi.increaseNowMoney(increaseNowMoneyDTO);

16
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/controller/app/rechargeorder/AppRechargeOrderController.java
View File

@ -4,15 +4,13 @@ import co.yixiang.yshop.framework.common.pojo.CommonResult;
import co.yixiang.yshop.framework.security.core.annotations.PreAuthenticated;
import co.yixiang.yshop.module.order.controller.app.rechargeorder.vo.AppRechargeOrderCreateReqVO;
import co.yixiang.yshop.module.order.service.rechargeorder.RechargeFacade;
import co.yixiang.yshop.module.order.service.rechargeorder.RechargeOrderService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.Valid;
@ -29,10 +27,20 @@ public class AppRechargeOrderController {
@Resource
private RechargeFacade rechargeFacade;
@Resource
private RechargeOrderService rechargeOrderService;
@PreAuthenticated
@PostMapping(value = "/create")
@Operation(summary = "充值")
public CommonResult<String> create(@Valid @RequestBody AppRechargeOrderCreateReqVO createReqVO) throws Exception {
return success(rechargeFacade.create(createReqVO));
}
@PreAuthenticated
@GetMapping(value = "/isPay")
@Operation(summary = "支付结果查询")
public CommonResult<Integer> isPay(@Valid String id){
return success(rechargeOrderService.isPay(id));
}
}

7
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/rechargeorder/RechargeOrderService.java
View File

@ -70,4 +70,11 @@ public interface RechargeOrderService {
void refund() throws Exception;
/**
* 支付结果查询
* @param id
* @return
*/
Integer isPay(String id);
}

10
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/rechargeorder/RechargeOrderServiceImpl.java
View File

@ -1,5 +1,6 @@
package co.yixiang.yshop.module.order.service.rechargeorder;
import cn.hutool.core.util.ObjectUtil;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.framework.mybatis.core.util.MyBatisUtils;
import co.yixiang.yshop.module.member.api.user.MemberUserApi;
@ -142,4 +143,13 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
}
@Override
public Integer isPay(String id) {
RechargeOrderDO orderDO = getRechargeOrder(id);
if (ObjectUtil.isNull(orderDO)) {
throw exception(RECHARGE_ORDER_NOT_EXISTS);
}
return getRechargeOrder(id).getStatus();
}
}

10
yshop-module-mall/yshop-module-order-biz/src/main/java/co/yixiang/yshop/module/order/service/storeorder/AppStoreOrderServiceImpl.java
View File

@ -1454,9 +1454,11 @@ public class AppStoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, Stor
updateOrderDO.setId(orderQueryVo.getId());
// 修改明细状态，并获取订单下一步状态
updateOrderDO.setRefundStatus(orderDetailService.updateState(param.getAfterSalesId(), orderQueryVo.getId()));
// 处理拼团订单
// 处理待拼团订单
if (ObjectUtil.isNotNull(orderQueryVo.getCampaignType()) &&
CampaignTypeEnum.TEAMWORK.getValue().equals(orderQueryVo.getCampaignType())) {
CampaignTypeEnum.TEAMWORK.getValue().equals(orderQueryVo.getCampaignType())
&& OrderInfoEnum.STATUS_WAIT_GROUP.getValue().equals(orderQueryVo.getStatus())
) {
teamworkInfoService.refundHandle(new TeamworkRefundParam()
.setUid(orderQueryVo.getUid()).setId(orderQueryVo.getTeamworkId()));
}
@ -1606,8 +1608,8 @@ public class AppStoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, Stor
OrderInfoEnum.PAY_STATUS_HAVE_PAID.getValue().equals(order.getPaid())).count();
// 计算待付款订单数
Long unpaidCount = storeOrderDOS.stream().filter(order ->
OrderInfoEnum.PAY_STATUS_UNPAID.getValue().equals(order.getPaid()) &&
OrderInfoEnum.STATUS_DEFAULT.getValue().equals(order.getStatus())).count();
OrderInfoEnum.PAY_STATUS_UNPAID.getValue().equals(order.getPaid()) &&
OrderInfoEnum.STATUS_DEFAULT.getValue().equals(order.getStatus())).count();
// 计算待发货订单数
Long unshippedCount = storeOrderDOS.stream().filter(order ->
OrderInfoEnum.PAY_STATUS_HAVE_PAID.getValue().equals(order.getPaid()) &&

2
yshop-module-mall/yshop-module-product-biz/src/main/java/co/yixiang/yshop/module/product/service/storeproduct/dto/YxStoreProductReplyDTO.java
View File

@ -16,7 +16,7 @@
//* @date 2020-05-12
//*/
//@Data
//public class YxStoreProductReplyDTO implements Serializable {
//public class YxStoreProductReplyDto implements Serializable {
//
// // 评论ID
// private Long id;

5
yshop-module-member/yshop-module-member-api/src/main/java/co/yixiang/yshop/module/member/api/user/dto/IncreaseNowMoneyDTO.java
View File

@ -17,6 +17,11 @@ public class IncreaseNowMoneyDTO {
*/
private String link;
/**
* 标题
*/
private String title;
/**
* 金额
*/

2
yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/api/user/MemberUserNowMoneyApiImpl.java
View File

@ -25,7 +25,7 @@ public class MemberUserNowMoneyApiImpl implements MemberUserNowMoneyApi {
memberUserService.incMoney(increaseNowMoneyDTO.getId(), increaseNowMoneyDTO.getAmount());
// 保存记录
userBillService.income(increaseNowMoneyDTO.getId(),
"充值", BillDetailEnum.CATEGORY_1.getValue(),
increaseNowMoneyDTO.getTitle(), BillDetailEnum.CATEGORY_1.getValue(),
BillDetailEnum.TYPE_1.getValue(),
increaseNowMoneyDTO.getAmount(),
increaseNowMoneyDTO.getAmount(),

5
yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/controller/app/address/AppUserAddressController.java
View File

@ -10,6 +10,7 @@ package co.yixiang.yshop.module.member.controller.app.address;
import cn.hutool.core.lang.Assert;
import co.yixiang.yshop.framework.common.pojo.CommonResult;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.framework.ip.core.Area;
import co.yixiang.yshop.framework.ip.core.utils.AreaUtils;
import co.yixiang.yshop.framework.security.core.annotations.PreAuthenticated;
@ -107,8 +108,8 @@ public class AppUserAddressController {
@PreAuthenticated
@GetMapping("/list")
@Operation(summary = "用户地址列表")
public CommonResult<List<AppUserAddressQueryVo>> getYxUserAddressPageList(@RequestParam(value = "page", defaultValue = "1") int page,
@RequestParam(value = "limit", defaultValue = "10") int limit) {
public CommonResult<PageResult<AppUserAddressQueryVo>> getYxUserAddressPageList(@RequestParam(value = "page", defaultValue = "1") int page,
@RequestParam(value = "limit", defaultValue = "10") int limit) {
Long uid = getLoginUserId();
return success(appUserAddressService.getList(uid, page, limit));
}

2
yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/convert/useraddress/UserAddressConvert.java
View File

@ -32,4 +32,6 @@ public interface UserAddressConvert {
PageResult<UserAddressRespVO> convertPage(PageResult<UserAddressDO> page);
PageResult<AppUserAddressQueryVo> convertQueryPage(PageResult<UserAddressDO> page);
}

3
yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/useraddress/AppUserAddressService.java
View File

@ -1,5 +1,6 @@
package co.yixiang.yshop.module.member.service.useraddress;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.member.controller.app.address.param.AppAddressParam;
import co.yixiang.yshop.module.member.controller.app.address.vo.AppUserAddressQueryVo;
import co.yixiang.yshop.module.member.dal.dataobject.useraddress.UserAddressDO;
@ -39,6 +40,6 @@ public interface AppUserAddressService extends IService<UserAddressDO> {
* @param limit limit
* @return List
*/
List<AppUserAddressQueryVo> getList(Long uid, int page, int limit);
PageResult<AppUserAddressQueryVo> getList(Long uid, int page, int limit);
}

13
yshop-module-member/yshop-module-member-biz/src/main/java/co/yixiang/yshop/module/member/service/useraddress/AppUserAddressServiceImpl.java
View File

@ -3,6 +3,8 @@ package co.yixiang.yshop.module.member.service.useraddress;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.yshop.framework.common.enums.ShopCommonEnum;
import co.yixiang.yshop.framework.common.pojo.PageResult;
import co.yixiang.yshop.module.member.controller.admin.useraddress.vo.UserAddressPageReqVO;
import co.yixiang.yshop.module.member.controller.app.address.param.AppAddressParam;
import co.yixiang.yshop.module.member.controller.app.address.vo.AppUserAddressQueryVo;
import co.yixiang.yshop.module.member.convert.useraddress.UserAddressConvert;
@ -104,11 +106,12 @@ public class AppUserAddressServiceImpl extends ServiceImpl<UserAddressMapper, Us
* @return List
*/
@Override
public List<AppUserAddressQueryVo> getList(Long uid, int page, int limit) {
Page<UserAddressDO> pageModel = new Page<>(page, limit);
IPage<UserAddressDO> pageList = this.lambdaQuery().eq(UserAddressDO::getUid, uid)
.orderByDesc(UserAddressDO::getIsDefault).page(pageModel);
return UserAddressConvert.INSTANCE.convertList02(pageList.getRecords());
public PageResult<AppUserAddressQueryVo> getList(Long uid, int page, int limit) {
UserAddressPageReqVO reqVO = new UserAddressPageReqVO();
reqVO.setUid(uid);
reqVO.setPageNo(page);
reqVO.setPageSize(limit);
return UserAddressConvert.INSTANCE.convertQueryPage(userAddressMapper.selectPage(reqVO));
}

2
yshop-module-pay/yshop-module-pay-api/src/main/java/co/yixiang/yshop/module/pay/enums/PayOrderConstants.java
View File

@ -15,5 +15,5 @@ public interface PayOrderConstants {
String PAY_REDIRECT_URL = "pages/payStatus/index?type=1";
// 充值回调地址
String RECHARGE_REDIRECT_URL = "views/account/balance/index";
String RECHARGE_REDIRECT_URL = "pages/payStatus/index?type=2";
}

2
yshop-module-pay/yshop-module-pay-biz/src/main/java/co/yixiang/yshop/module/pay/controller/app/AppPayController.java
View File

@ -96,7 +96,7 @@ public class AppPayController {
}
if (PayTypeEnum.WEIXIN.getType().equals(param.getPayType())) {
//小程序支付需要openid
if (Objects.isNull(user.getRoutineOpenId())) throw exception(USER_NOT_BINDING_WX);
if (Objects.isNull(user.getRoutineOpenId())) throw exception(USER_NOT_BINDING_WX);
}
payParam.setType(param.getPayType());
payParam.setMerchantDetailsDO(merchantDetailsDO);

3
yshop-module-system/yshop-module-system-biz/src/main/java/co/yixiang/yshop/module/system/dal/mysql/dict/DictDataMapper.java
View File

@ -52,4 +52,7 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> {
@Update("update system_dict_data set value = #{value} where label = #{label}")
void updateDictByLabel(@Param("label") String label, @Param("value") String value);
@Update("update yshop_store_product set distribution_purchase = #{distributionPurchase} where distribution_rule = 0")
void updateProductDistributionPurchase(@Param("distributionPurchase") String distributionPurchase);
}

5
yshop-module-system/yshop-module-system-biz/src/main/java/co/yixiang/yshop/module/system/service/dict/DictDataServiceImpl.java
View File

@ -21,6 +21,7 @@ import java.util.*;
import static co.yixiang.yshop.framework.common.exception.util.ServiceExceptionUtil.exception;
import static co.yixiang.yshop.module.system.enums.DictTypeConstants.*;
import static co.yixiang.yshop.module.system.enums.DistributorDictEnum.DISTRIBUTOR_PURCHASE;
import static co.yixiang.yshop.module.system.enums.ErrorCodeConstants.*;
/**
@ -226,6 +227,10 @@ public class DictDataServiceImpl implements DictDataService {
@Override
public void updateDistributorConfig(List<DictDataUpdateReqVO> reqVO) {
for (DictDataUpdateReqVO req : reqVO) {
// 自动返佣
if(DISTRIBUTOR_PURCHASE.getDictType().equals(req.getDictType())){
dictDataMapper.updateProductDistributionPurchase(req.getValue());
}
this.updateDictData(req);
}
}