Procházet zdrojové kódy

[PO][修改]:集团版预修改

release_toaliyun_real
Stormeye Wu před 6 roky
rodič
revize
17f5d0b692
10 změnil soubory, kde provedl 18 přidání a 19 odebrání
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  4. +1
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  6. +3
    -2
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java
  7. +3
    -5
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java
  8. +2
    -1
      mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java
  10. +3
    -2
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java Zobrazit soubor

@@ -106,7 +106,7 @@ public class KwMerchantMeterController extends BaseController {
@GetMapping("getMechantMeter")
@SystemControllerLog(description = "商户列表")
public ResultData getMechantMeter() {
return new ResultData(kwMerchantMeterService.getMerchantMeter(getTenantId()));
return new ResultData(kwMerchantMeterService.getMerchantMeter(getTenantInfo()));
}

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java Zobrazit soubor

@@ -61,7 +61,7 @@ public interface WxRentContractMapper extends CommonMapper<WxRentContract, Long>
List<WxRentContract> selectRentContractByShopId(WxRentContract record);

List<WxRentContract> selectRentContractByShopIds(@Param("shopIds") Collection<Long> shopIds,
@Param("shopIdsRegexp") String shopIdsRegexp,@Param("tenantId") String tenantId);
@Param("shopIdsRegexp") String shopIdsRegexp);

int hasContractNumber(WxRentContract wxRentContract);



+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java Zobrazit soubor

@@ -94,7 +94,7 @@ public interface WxRentContractService {

WxRentContract getByBill(WxBillRent billRent);

Map<Long,WxRentContract> selectRentContractByShopIds(Collection<Long> shopIds, String shopIdsRegexp,String tenantId);
Map<Long,WxRentContract> selectRentContractByShopIds(Collection<Long> shopIds, String shopIdsRegexp);

int selectContractCountByShopId(WxRentContract wxRentContract);



+ 1
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Zobrazit soubor

@@ -1396,8 +1396,6 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新");
}

// TODO B端收银台支付,核销券相关操作

// B端刷卡支付发券
logger.info("订单刷卡发券 开始");
try {
@@ -1520,7 +1518,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
public void handlePayOrderFail(WxPayOrder record, int status) {
// 判断支付状态
if (record.getPayOrderStatus() == EnumPayStatus.PAY_STATUS_WAIT.getCode()) {
if (record.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_WAIT.getCode())) {
logger.error("pay handle, payOrder " + record.getPayOrderNo() +
"is complete, orderId : " + record.getOrderId());
return;


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Zobrazit soubor

@@ -2497,8 +2497,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}

@Override
public Map<Long, WxRentContract> selectRentContractByShopIds(Collection<Long> shopIds, String shopIdsRegexp,String tenantId) {
List<WxRentContract> list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp,tenantId);
public Map<Long, WxRentContract> selectRentContractByShopIds(Collection<Long> shopIds, String shopIdsRegexp) {
List<WxRentContract> list = wxRentContractMapper.selectRentContractByShopIds(shopIds, shopIdsRegexp);
List<String> shopIdArr = Arrays.asList(StringUtils.split(shopIdsRegexp,"|")) ;
Map<Long, WxRentContract> allShopContract = new HashMap<>();
for (WxRentContract wxRentContract : list) {


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java Zobrazit soubor

@@ -95,9 +95,10 @@ public class InvestBaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceIm
}

void checkUserAndTenant(T input, Consumer<T> consumer) {
MallUserInfo userInfo = InvestUserContext.getUser();
InvestHelper.notNull(input, "参数 " + input);
InvestHelper.notNull(InvestUserContext.getUser(), ErrorCode.USER_IS_EMPTY);
((InvestBaseEntity) input).setTenantId(InvestUserContext.getUser().getTenantId());
InvestHelper.notNull(userInfo, ErrorCode.USER_IS_EMPTY);
((InvestBaseEntity) input).updateTenantInfo(userInfo);
if (consumer != null) {
consumer.accept(input);
}


+ 3
- 5
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Zobrazit soubor

@@ -553,8 +553,7 @@ public class InvestBizServiceImpl implements InvestBizService {
if (CollectionUtils.isNotEmpty(shops)) {
Collection<Long> shopPointIds = buildShopContractQuery(shops, EnumRentShopType.POINT);
Collection<Long> shopIds = buildShopContractQuery(shops, EnumRentShopType.SHOP);
shopContractMap = rentContractService.selectRentContractByShopIds(shopPointIds, StringUtils.join(shopIds, "|"),
InvestUserContext.getUser().getTenantId());
shopContractMap = rentContractService.selectRentContractByShopIds(shopPointIds, StringUtils.join(shopIds, "|"));
}
for (WxShop shop : shops) {
WxRentContract contract = shopContractMap.get(shop.getId());
@@ -767,7 +766,7 @@ public class InvestBizServiceImpl implements InvestBizService {
WxShop shop = shopService.getById(shopId);
InvestHelper.notNull(shop, "shop 不存在");
//3、商品合同信息
Map<Long, WxRentContract> shopContractMap = rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId()), InvestUserContext.getUser().getTenantId());
Map<Long, WxRentContract> shopContractMap = rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId()));
WxRentContract contract = shopContractMap.get(shop.getId());
InvestHelper.notNull(contract, "合同信息不存在");
Map<String, Object> map = new HashMap<>();
@@ -918,8 +917,7 @@ public class InvestBizServiceImpl implements InvestBizService {
if (Objects.isNull(shop)) {
return new HashMap<>();
}
return rentContractService.selectRentContractByShopIds(Collections.singletonList(shop.getId()), StringUtils.join(shop.getId(), ""),
InvestUserContext.getUser().getTenantId());
return rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId(), ""));
}

@Override


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java Zobrazit soubor

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.dto.KwMerchantMeterDataDto;
import com.iformall.domain.dto.KwMerchantMeterDto;
import com.iformall.domain.po.KwMerchantMeter;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.KwMerchantMeterDataVo;
import com.iformall.domain.vo.KwMerchantMeterVo;
import com.iformall.domain.vo.MerchantMeterVo;
@@ -54,7 +55,7 @@ public interface KwMerchantMeterService {
int unbind(Long meterId);
int unbindBatch(Long merchantId);

List<MerchantMeterVo> getMerchantMeter(String tenantId);
List<MerchantMeterVo> getMerchantMeter(TenantEntity tenantEntity);


}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/kw/impl/KwBoxServiceImpl.java Zobrazit soubor

@@ -109,7 +109,7 @@ public class KwBoxServiceImpl implements KwBoxService {
KwMeterData kwMeterData = new KwMeterData();

kwMeterData.setId(idWorker.nextId());
kwMeterData.setTenantId(kwBox.getTenantId());
kwMeterData.updateTenantInfo(kwBox);
kwMeterData.setAddress(address);
kwMeterData.setBoxId(kwBox.getId());
kwMeterData.setCreateTime(recordTime);


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java Zobrazit soubor

@@ -7,6 +7,7 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.dto.KwMerchantMeterDataDto;
import com.iformall.domain.dto.KwMerchantMeterDto;
import com.iformall.domain.po.KwMerchantMeter;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.KwMerchantMeterDataVo;
import com.iformall.domain.vo.KwMerchantMeterVo;
import com.iformall.domain.vo.MerchantMeterVo;
@@ -88,8 +89,8 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService {
}

@Override
public List<MerchantMeterVo> getMerchantMeter(String tenantId) {
return kwMerchantMeterMapper.getMerchantMeter(tenantId);
public List<MerchantMeterVo> getMerchantMeter(TenantEntity tenantEntity) {
return kwMerchantMeterMapper.getMerchantMeter(tenantEntity.getTenantId());
}

}

Načítá se…
Zrušit
Uložit