diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 6a9772d8..ec33d98e 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -97,13 +97,9 @@ public enum ResultCode { USER_RECEIPT_NOT_EXIST(20014, "会员发票信息不存在"), USER_EDIT_ERROR(20015, "用户修改失败"), USER_OLD_PASSWORD_ERROR(20016, "旧密码不正确"), -<<<<<<< HEAD USER_COLLECTION_EXIST(20017,"无法重复收藏"), USER_GRADE_IS_DEFAULT(20018,"会员等级为默认会员等级"), -======= - USER_COLLECTION_EXIST(2001, "无法重复收藏"), DELETE_EXIST(2001, "无法重复收藏"), ->>>>>>> master /** * 权限 diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java index 7a9ef202..96cc6564 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java @@ -171,10 +171,6 @@ public class DistributionServiceImpl extends ServiceImpl>>>>>> master } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java index a92fef42..b6c5f74a 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java @@ -33,11 +33,8 @@ import java.util.Date; @Service @Transactional public class MemberWithdrawApplyServiceImpl extends ServiceImpl implements MemberWithdrawApplyService { -<<<<<<< HEAD -======= //提现申请数据层 ->>>>>>> master //会员余额 @Autowired private MemberWalletService memberWalletService; @@ -45,12 +42,8 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl>>>>>> master if (memberWithdrawApply != null) { //写入备注 memberWithdrawApply.setInspectRemark(remark); @@ -63,11 +56,7 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl>>>>>> master //提现，微信提现成功后扣减冻结金额 Boolean bool = memberWalletService.withdrawal(memberWithdrawApply); if (bool) { @@ -80,11 +69,7 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl>>>>>> master //需要从冻结金额扣减到余额 memberWalletService.increaseWithdrawal(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核拒绝，提现金额解冻到余额", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name()); return true; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index 6bcd2b58..9aa5d281 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -205,12 +205,9 @@ public class Order extends BaseEntity { BeanUtil.copyProperties(cartVO.getPriceDetailDTO(), this); BeanUtil.copyProperties(cartVO, this); this.setId(oldId); -<<<<<<< HEAD //循环购物车列表判断是否为促销订单 -======= this.setOrderType(OrderTypeEnum.NORMAL.name()); //促销信息填充 ->>>>>>> master if (cartVO.getSkuList().get(0).getPromotions() != null) { //判断是否为拼团订单 Optional pintuanId = cartVO.getSkuList().get(0).getPromotions().stream().filter(i -> i.getPromotionType().equals(PromotionTypeEnum.PINTUAN.name())).map(PromotionGoods::getPromotionId).findFirst(); @@ -235,7 +232,6 @@ public class Order extends BaseEntity { this.setOrderStatus(OrderStatusEnum.UNPAID.name()); this.setPayStatus(PayStatusEnum.UNPAID.name()); this.setDeliverStatus(DeliverStatusEnum.UNDELIVERED.name()); -<<<<<<< HEAD //填充订单收件人信息 this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath()); this.setConsigneeAddressPath(tradeDTO.getMemberAddress().getConsigneeAddressPath()); @@ -247,7 +243,6 @@ public class Order extends BaseEntity { this.setUsePlatformMemberCouponId(tradeDTO.getPlatformCoupon().getMemberCoupon().getId()); } //判断是否使用店铺优惠券 -======= //如果有收货地址，才记录收货地址 if (tradeDTO.getMemberAddress() != null) { this.setConsigneeAddressIdPath(tradeDTO.getMemberAddress().getConsigneeAddressIdPath()); @@ -261,7 +256,6 @@ public class Order extends BaseEntity { this.setUsePlatformMemberCouponId(tradeDTO.getPlatformCoupon().getMemberCoupon().getId()); } //店铺优惠券判定 ->>>>>>> master if (tradeDTO.getStoreCoupons() != null && !tradeDTO.getStoreCoupons().isEmpty()) { StringBuilder storeCouponIds = new StringBuilder(); for (String s : tradeDTO.getStoreCoupons().keySet()) { diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java index f8219f4b..087264ec 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java @@ -13,10 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -<<<<<<< HEAD -======= -import org.springframework.beans.factory.annotation.Autowired; ->>>>>>> master import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java index 6ef3ea52..39b02b70 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java @@ -1,9 +1,9 @@ package cn.lili.controller.member; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.entity.dos.MemberGrade; diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityController.java index 1b9bf217..cb8a9b39 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityController.java @@ -1,9 +1,9 @@ package cn.lili.controller.other.broadcast; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.broadcast.entity.dos.Commodity; diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java index fb3f2da3..7d7937a6 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java @@ -1,9 +1,9 @@ package cn.lili.controller.other.broadcast; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.utils.PageUtil; -import cn.lili.common.utils.ResultUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.base.entity.enums.ClientTypeEnum;