czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2024-11-25 16:39:32 +08:00
parent 1b35d0327e 4fb6310c9c
commit a7eb15781f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbCreditBuyerOrderServiceImpl.java
View File

@@ -110,7 +110,7 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
Assert.notNull(record.getOrderId(), "{}({})不能为空", "订单id", "orderId"); Assert.notNull(record.getOrderId(), "{}({})不能为空", "订单id", "orderId");
Assert.notNull(record.getRepaymentAmount(), "{}({})不能为空", "还款金额", "repaymentAmount"); Assert.notNull(record.getRepaymentAmount(), "{}({})不能为空", "还款金额", "repaymentAmount");
Assert.notEmpty(record.getPaymentMethod(), "{}({})不能为空", "支付方式", "paymentMethod"); Assert.notEmpty(record.getPaymentMethod(), "{}({})不能为空", "支付方式", "paymentMethod");
Assert.notNull(record.getPaymentTime(), "{}({})不能为空", "还款时间", "paymentTime"); //Assert.notNull(record.getPaymentTime(), "{}({})不能为空", "还款时间", "paymentTime");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
throw new BadRequestException(e.getMessage()); throw new BadRequestException(e.getMessage());
} }
@@ -147,8 +147,10 @@ public class TbCreditBuyerOrderServiceImpl extends ServiceImpl<TbCreditBuyerOrde
entity.setPaidAmount(NumberUtil.add(entity.getPaidAmount(), record.getRepaymentAmount())); entity.setPaidAmount(NumberUtil.add(entity.getPaidAmount(), record.getRepaymentAmount()));
entity.setLastPaymentTime(new Date()); entity.setLastPaymentTime(new Date());
entity.setLastPaymentMethod(record.getPaymentMethod()); entity.setLastPaymentMethod(record.getPaymentMethod());
entity.setRemark(record.getRemark());
super.updateById(entity); super.updateById(entity);
record.setCreateTime(new Date()); record.setCreateTime(new Date());
record.setPaymentTime(new Date());
tbCreditPaymentRecordMapper.insert(record); tbCreditPaymentRecordMapper.insert(record);
} }

10
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/BindServiceImpl.java
View File

@@ -47,15 +47,17 @@ public class BindServiceImpl implements BindService {
@Override @Override
public JSONObject subInvoicing(Map<String, Object> params) { public JSONObject subInvoicing(Map<String, Object> params) {
String shopId = params.get("shopId").toString();
params.remove("shopId");
String result = HttpUtil.post(url + "cash/subinvoicing", params, 5000); String result = HttpUtil.post(url + "cash/subinvoicing", params, 5000);
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
if (jsonObject.getInteger("code").equals(1)) { if (jsonObject.getInteger("code").equals(1)) {
if (params.get("shopId") != null) { if (StringUtils.isNotBlank(shopId)) {
if (redisUtils.hasKey(CacheKey.INVOICE_SD_TYPE + params.get("shopId"))) { if (redisUtils.hasKey(CacheKey.INVOICE_SD_TYPE + shopId)) {
Set<Object> articles = redisUtils.sGet(CacheKey.INVOICE_SD_TYPE + params.get("shopId")); Set<Object> articles = redisUtils.sGet(CacheKey.INVOICE_SD_TYPE + shopId);
if (!articles.contains(params.get("article"))) { if (!articles.contains(params.get("article"))) {
articles.add(params.get("article")); articles.add(params.get("article"));
redisUtils.sSet(CacheKey.INVOICE_SD_TYPE + params.get("shopId"), articles); redisUtils.sSet(CacheKey.INVOICE_SD_TYPE + shopId, articles);
} }
} }
} }