zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:cd68bf0be8a1e67d93043e8cc387a08a7a0f014d
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:6d81160d3045a0d320851b70045e41d50749174d
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

2 Commits
cd68bf0be8 ... 6d81160d30

Author SHA1 Message Date
perry 6d81160d30 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-24 18:10:21 +08:00
perry ac7a9d9c4c 访问地址 2023-05-24 18:10:09 +08:00
5 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/notify/WxPayNotifyController.java
View File

@ -46,7 +46,7 @@ public class WxPayNotifyController {
private StoreOrderService storeOrderService;
@Autowired
private RechargeOrderMapper rechargeOrderMapper;
@Autowired
private PhoneRecordService phoneRecordService;

1
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/category/impl/CategoryServiceImpl.java
View File

@ -317,7 +317,6 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
list.add(tree);
}
}
log.info("无限极分类 : getTree:" + JsonUtils.toJsonString(list));
return list;
}

4
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/OrderServiceImpl.java
View File

@ -325,13 +325,13 @@ public class OrderServiceImpl implements OrderService {
@Override
public OrderDataResponse orderData(String dateLimit, Integer type, String payType) {
OrderDataResponse response = new OrderDataResponse();
if (type.equals(2)) {
if (type!=null && type==2) {
type = null;
}
// 已完成订单数量
response.setCompleteCount(getCount(dateLimit, Constants.ORDER_STATUS_COMPLETE, type));
// 待核销订单数量
response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type));
// response.setEvaluatedCount(getCount(dateLimit, Constants.ORDER_STATUS_STR_TOBE_WRITTEN_OFF, type));
// 支付订单总数
response.setOrderCount(getCount(dateLimit, Constants.ORDER_STATUS_ALL, type));
// 待收货订单数量

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java
View File

@ -1275,7 +1275,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
phoneRecordAdd.setMoney(info.getPrice());
phoneRecordAdd.setOrderNo(orderDO.getOrderId());
phoneRecordAdd.setOrderTime(LocalDateTimeUtil.formatNormal(orderDO.getPayTime().toLocalDate()));
phoneRecordAdd.setGear(rechargeGearDO.getRefundAmount().toString());
phoneRecordAdd.setGear(rechargeGearDO.getRefundAmount().intValue()+"");
phoneRecordAdds.add(phoneRecordAdd);
recordDOS.add(phoneRecordDO);
});

2
yudao-server/src/main/resources/application-local.yaml
View File

@ -255,5 +255,5 @@ justauth:
timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
phone:
query-url: http://192.168.1.189:4006/cyywl-phone-query-api/
query-url: http://phone.cyywl.top/cyywl-phone-query-api/
token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0