Authored by chenchao

rename 4 correct spelling

... ... @@ -3,13 +3,13 @@ package com.yohoufo.order.common;
/**
* Created by chao.chen on 2018/12/11.
*/
public enum SurperEntrySellerStatus {
public enum SuperEntrySellerStatus {
COMMON((short)0),SURPER((short)1);
COMMON((short)0), SUPER((short)1);
short code;
SurperEntrySellerStatus(short code) {
SuperEntrySellerStatus(short code) {
this.code = code;
}
... ...
... ... @@ -449,8 +449,7 @@ public class SellerOrderController {
@RequestMapping(params = "method=ufo.order.isSurperEntrySeller")
@ResponseBody
public ApiResponse isSurperEntrySeller(
@RequestParam("uid") int uid) {
public ApiResponse isSuperEntrySeller(@RequestParam("uid") int uid) {
boolean isSuper = sellerService.isSuperEntrySeller(uid);
return new ApiResponse.ApiResponseBuilder().code(200).data(isSuper).message("刷新成功").build();
... ...
... ... @@ -19,5 +19,5 @@ public class BatchPublishTailEvent extends Event {
private int sellerUid;
private SellerOrderSubmitHandler.ForkJoinResult fjr;
private SellerWallet sellerWallet;
private boolean isSurper;
private boolean isSuper;
}
... ...
... ... @@ -33,7 +33,7 @@ public class BatchPublishTailHandler implements IEventHandler<BatchPublishTailEv
@Subscribe
public void handle(BatchPublishTailEvent event) {
logger.info("in handle BatchPublishTailEvent event {}", event);
batchPublishTailProcess(event.getFjr(), event.getSellerWallet(), event.isSurper(), event.getSellerUid());
batchPublishTailProcess(event.getFjr(), event.getSellerWallet(), event.isSuper(), event.getSellerUid());
}
private void batchPublishTailProcess(SellerOrderSubmitHandler.ForkJoinResult fjr,
... ...
... ... @@ -617,7 +617,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic
BigDecimal preSalePrice = cppDto.getPreSalePrice(),
salePrice = cppDto.getSalePrice();
SellerBo sellerBo = sellerAuthCheckService.checkAuth(req.getUid(), SellerFuncEnum.BATCH_CHANGEPRICE);
boolean isSurper = sellerBo.getIsSuper();
boolean isSuper = sellerBo.getIsSuper();
int uid = req.getUid();
Map<Integer, SkupDto> skupMap = cppDto.getSkupMap();
SellerOrderComputeResult computeResult = cppDto.getComputeResult();
... ... @@ -634,7 +634,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic
.seriNo(String.valueOf(req.getBatchNo()))
.type(swdType.getValue()).build();
SellerWallet sellerWallet = isSurper ? new SellerWallet() : merchantOrderPaymentService.changePriceUseEarnest(uid, totalDiffMoney, moai);
SellerWallet sellerWallet = isSuper ? new SellerWallet() : merchantOrderPaymentService.changePriceUseEarnest(uid, totalDiffMoney, moai);
int successCnt = 0;
int failCnt = 0;
if(Objects.nonNull(sellerWallet)) {
... ... @@ -658,7 +658,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic
//4 划账记录
List<SellerOrder> psoList = sellerOrderMapper.selectBySkups(skupSet);
if(!isSurper) {
if(!isSuper) {
List<OrderInfo> orderList = psoList.parallelStream().map(
so -> OrderInfo.builder().orderCode(so.getOrderCode()).amount(diffEarnestMoney).build())
.collect(Collectors.toList());
... ... @@ -802,7 +802,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic
//(异步实现)同步数据到prd,记录支付,
BatchPublishTailEvent bpte = BatchPublishTailEvent.builder()
.sellerUid(uid)
.isSurper(isSuper)
.isSuper(isSuper)
.fjr(fjr).sellerWallet(sellerWallet).build();
EventBusPublisher.publishEvent(bpte);
... ...
... ... @@ -9,9 +9,8 @@ import com.yohoufo.common.cache.CacheKeyEnum;
import com.yohoufo.dal.order.SellerEnterApplyMapper;
import com.yohoufo.dal.order.StoredSellerMapper;
import com.yohoufo.dal.order.SuperEntrySellerMapper;
import com.yohoufo.dal.order.model.SellerEnterApply;
import com.yohoufo.dal.order.model.SuperEntrySeller;
import com.yohoufo.order.common.SurperEntrySellerStatus;
import com.yohoufo.order.common.SuperEntrySellerStatus;
import com.yohoufo.order.service.IStoredSellerService;
import com.yohoufo.order.service.MerchantOrderPaymentService;
import com.yohoufo.order.service.cache.StoredSellerCacheService;
... ... @@ -99,7 +98,7 @@ public class SellerService {
logger.info("in getSuperEntrySellerUids hit cache uidList {}", uidList);
return uidList;
}
List<SuperEntrySeller> sesList = superEntrySellerMapper.selectAll(SurperEntrySellerStatus.SURPER.getCode());
List<SuperEntrySeller> sesList = superEntrySellerMapper.selectAll(SuperEntrySellerStatus.SUPER.getCode());
if (CollectionUtils.isNotEmpty(sesList)){
uidList = sesList.parallelStream().map(SuperEntrySeller::getUid).collect(Collectors.toList());
... ...
... ... @@ -13,7 +13,7 @@ import com.yohoufo.dal.order.SuperEntrySellerMapper;
import com.yohoufo.dal.order.model.StoredSeller;
import com.yohoufo.dal.order.model.SuperEntrySeller;
import com.yohoufo.dal.user.model.ZhiMaCert;
import com.yohoufo.order.common.SurperEntrySellerStatus;
import com.yohoufo.order.common.SuperEntrySellerStatus;
import com.yohoufo.order.service.IStoredSellerService;
import com.yohoufo.order.service.MerchantOrderPaymentService;
import com.yohoufo.order.service.cache.StoredSellerCacheService;
... ... @@ -172,7 +172,7 @@ public class StoreSellerServiceImpl implements IStoredSellerService {
@Override
public int disableSpecialSuper(Integer uid) {
short status = SurperEntrySellerStatus.COMMON.getCode();
short status = SuperEntrySellerStatus.COMMON.getCode();
SuperEntrySeller condition = new SuperEntrySeller();
condition.setUid(uid);
condition.setStatus(status);
... ...
... ... @@ -97,7 +97,7 @@ public class ImportPublishExcutor implements PublishExcutor<BatchImportPrdReq, S
boolean isSuper = node.isSuper();
BatchPublishTailEvent bpte = BatchPublishTailEvent.builder()
.sellerUid(uid)
.isSurper(isSuper)
.isSuper(isSuper)
.fjr(fjr).sellerWallet(null).build();
EventBusPublisher.publishEvent(bpte);
return fjr;
... ...