Sfoglia il codice sorgente

tt

release_toaliyun_real
xhxu 5 anni fa
parent
commit
c7751c7e1d
4 ha cambiato i file con 12 aggiunte e 17 eliminazioni
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  2. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  3. +5
    -16
      mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java
  4. +1
    -1
      mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java Vedi File

@@ -107,6 +107,7 @@ public interface WxMerchantService {
* @param id
* @return
*/
WxMerchant selectById(Long id);
WxMerchant getById(Long id);

/**


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Vedi File

@@ -155,6 +155,11 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return collect;
}

@Override
public WxMerchant selectById(Long id) {
return wxMerchantMapper.selectById(id);
}

@Override
public WxMerchant getById(Long id) {
WxMerchant wxMerchant = wxMerchantMapper.selectById(id);


+ 5
- 16
mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java Vedi File

@@ -64,25 +64,14 @@ public class WxMerchantController extends BaseController {
}

@ApiOperation("根据code查询接口")
@GetMapping("/findByCode")
@GetMapping("/findById")
@ApiImplicitParam(name = "merchantCode", value = "merchantCode", dataType = "String", paramType = "query", required = true)
public ResultData findByCode(String merchantCode) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::findByCode");
if(merchantCode == null) {
public ResultData findById(Long id) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::findById");
if(id == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
String codeMD5 = HashUtil.DecodeByMD5(merchantCode);
if(StringUtils.isBlank(codeMD5)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
HashMap<String, String> params = new HashMap<String, String>();
TenantEntity tenantEntity = getTenantInfo();
params.put("tenantId", tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
params.put("parentTenantId", tenantEntity.getParentTenantId());
}
params.put("merchantCode", codeMD5);
WxMerchantVo wxMerchant = wxMerchantService.getMerchantInfo(params);
WxMerchant wxMerchant = wxMerchantService.selectById(id);
return new ResultData(wxMerchant);
}



+ 1
- 1
mallinkTTCApi/src/main/java/com/iformall/schedule/TtOrderExpiringSchedule.java Vedi File

@@ -42,7 +42,7 @@ public class TtOrderExpiringSchedule {
return tenantEntity;
}

@Scheduled(cron = "0 */1 * * * *?") // 每1分钟检查一次
@Scheduled(cron = "0 */10 * * * *?") // 每10分钟检查一次
public void orderExpireSchedule() {

WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(getTenantInfo(), EnumPayWay.PAY_WAY_TT);


Caricamento…
Annulla
Salva