diff --git a/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java b/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java index e645d4e..6571928 100644 --- a/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java +++ b/jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java @@ -14,6 +14,8 @@ public class WebServiceConstant { public final static String URL = "https://rocgw.jcsk100.com/external/api"; + public final static String TOKEN_KEY = "JCSK_YHDJ_"; + public final static String APPKEY = "935248bf224f6c8431cdc1969f029519"; public final static String APPSECRET = "5d773885d97112ed"; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileQueryTWODTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileQueryTWODTO.java index 5627cea..b216e69 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileQueryTWODTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/FileQueryTWODTO.java @@ -31,7 +31,7 @@ public class FileQueryTWODTO { private String nsrsbh; - private FileQueryJsonDataTWODTO jsondata; + private FileQueryJsonDataTWODTO jsonData; } diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/PrintXMLJsonDataTWODTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/PrintXMLJsonDataTWODTO.java index 48b98da..5f02260 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/PrintXMLJsonDataTWODTO.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/jcsk/PrintXMLJsonDataTWODTO.java @@ -20,7 +20,6 @@ public class PrintXMLJsonDataTWODTO { private String fphm; @ApiModelProperty(value = "红字确认单编号") - @NotEmpty private String hzqrdbh; @NotEmpty diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java index bc15741..26e3759 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/JcskInvoiceApiServiceImpl.java @@ -7,7 +7,10 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.json.JSONNull; import com.baomidou.mybatisplus.core.conditions.query.Query; +import com.jianshui.common.core.redis.RedisCache; import com.jianshui.common.utils.BeanToMapUtils; +import com.jianshui.common.utils.spring.SpringUtils; +import com.jianshui.invoice.constant.elephant.ElephantConstants; import com.jianshui.invoice.domain.dto.api.*; import com.jianshui.invoice.domain.dto.api.jcsk.*; @@ -268,6 +271,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { } + /** * 发票打印 * @@ -889,7 +893,7 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { FileQueryTWODTO fileQueryTWODTO = new FileQueryTWODTO(); FileQueryJsonDataTWODTO fileQueryJsonDataTWODTO = BeanUtil.copyProperties(invoiceAllFileQueryTWODTO, FileQueryJsonDataTWODTO.class); - fileQueryTWODTO.setJsondata(fileQueryJsonDataTWODTO); + fileQueryTWODTO.setJsonData(fileQueryJsonDataTWODTO); // 查询用户信息组装 InvoiceAllYhdj yhdj = getUserInfo(companyservice); @@ -1588,10 +1592,23 @@ public class JcskInvoiceApiServiceImpl implements IInvoiceApiService { */ public InvoiceAllYhdj getUserInfo(Companyservice companyservice) { + String identity = companyservice.getIdentity(); + String sellertax = companyservice.getSellertax(); + + RedisCache redisCache = SpringUtils.getBean(RedisCache.class); + JSONObject yhdjObj = redisCache.getCacheObject(WebServiceConstant.TOKEN_KEY + sellertax + "_"+ identity); + + // TODO: 2023/5/17 急急急 +// JSONObject obj = JSONObject.parseObject(info); +// Long exprieTime = System.currentTimeMillis(); +// exprieTime = exprieTime + (int) obj.get("expires_in") * 1000L; // 过期时间 +// obj.put("exprieTime", exprieTime); +// redisCache.setCacheObject(ElephantConstants.TOKEN_REDIS_KEY + "appkey:" + appkey, obj); + // 查询用户登记参数 QueryWrapper yhdjQueryWrapper = new QueryWrapper<>(); - yhdjQueryWrapper.eq("nsrsbh", companyservice.getSellertax()); - yhdjQueryWrapper.eq("identity", companyservice.getIdentity()); + yhdjQueryWrapper.eq("nsrsbh", sellertax); + yhdjQueryWrapper.eq("identity", identity); InvoiceAllYhdj invoiceAllYhdj = yhdjMapper.selectOne(yhdjQueryWrapper); return invoiceAllYhdj; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java index dada513..0eca40e 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java @@ -173,7 +173,7 @@ public class IncomeTest { // 得到上一天的Date order = "{\n" + " \"GMFSBH\": \"9111122223333CKFPT\",\n" + // 15 或 18 位 - " \"PCH\": \"12345678901234567890123456789012\",\n" + // 32 位如果多次重复的话,此值要一样,代表是一次请求 + " \"PCH\": \"12345678901234567890123456789013\",\n" + // 32 位如果多次重复的话,此值要一样,代表是一次请求 " \"CJKSRQ\": \"20200501000000\",\n" + // YYYYMMDDHHMMSS 例如:20170101140245 " \"CJJSRQ\": \"" + DateUtil.format(yestday, "yyyyMMddHHmmss") + "\",\n" + // YYYYMMDDHHMMSS 例如:20170101140345 @@ -215,7 +215,7 @@ public class IncomeTest { System.out.println("-------------------获取统计结果-----------------------------"); order = "{\n" + // " \"PCH\": \"" + uuid + "\",\n" + - " \"PCH\": \"3b8028691eb7447389742b00027e4252\",\n" + + " \"PCH\": \"75954a76fd654c2daa8f91f9837cb448\",\n" + " \"GMFSBH\": \"9111122223333CKFPT\",\n" + " \"taxNo\": \"9111122223333CKFPT\"\n" + "}";