ldt-core/src/main/java/org/springblade/gateway/common_gateway/controller/AppBillsController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -32,10 +33,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -90,10 +89,18 @@ public class AppBillsController {
 	@GetMapping("/myBills")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "我的账单", notes = "传入bills")
-	public R<IPage<AppBillsVO>> myBills(Bills bills, Query query) {
-		String format = DateUtil.format(bills.getCreateTime(), "yyyy");
-		bills.setCreateTime(null);
+	public R<IPage<AppBillsVO>> myBills(Bills bills, Query query ,String yearMoth) {
+		String format = null;
+		if (bills.getCreateTime() != null) {
+			//筛选年
+			format = DateUtil.format(bills.getCreateTime(), "yyyy");
+			bills.setCreateTime(null);
+		}
 
+		if (StrUtil.isNotBlank(yearMoth)) {
+			//筛选年月
+			format = DateUtil.format(bills.getCreateTime(),"yyyy-MM");
+		}
 		QueryWrapper<Bills> queryWrapper = new QueryWrapper();
 		queryWrapper.lambda()
 			.eq(Bills::getPayId,bills.getPayId())

ldt-core/src/main/java/org/springblade/gateway/shop_gateway/controller/AppShopController.java

@@ -1,5 +1,7 @@
 package org.springblade.gateway.shop_gateway.controller;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
@@ -13,7 +15,9 @@ import org.springblade.common.enums.AppConstant;
 import org.springblade.common.enums.WithdrawType;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.tenant.annotation.TenantIgnore;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.support.Kv;
 import org.springblade.gateway.shop_gateway.entity.dto.ShopAuditDto;
 import org.springblade.gateway.shop_gateway.entity.vo.BalanceAccountInfoVO;
 import org.springblade.gateway.shop_gateway.entity.vo.IndexVO;
@@ -23,24 +27,25 @@ import org.springblade.gateway.shop_gateway.service.IAppShopService;
 import org.springblade.ldt.bills.entity.Bills;
 import org.springblade.ldt.bills.entity.WithdrawRec;
 import org.springblade.ldt.bills.service.IBillsService;
-import org.springblade.ldt.notice.entity.NoticeManagement;
 import org.springblade.ldt.notice.entity.NoticeManagementContent;
 import org.springblade.ldt.notice.service.INoticeManagementContentService;
-import org.springblade.ldt.notice.service.INoticeManagementService;
-import org.springblade.ldt.notice.vo.NoticeManagementVO;
 import org.springblade.ldt.notice.wrapper.NoticeManagementContentWrapper;
-import org.springblade.ldt.notice.wrapper.NoticeManagementWrapper;
 import org.springblade.ldt.shop.entity.Shop;
 import org.springblade.ldt.shop.service.IShopService;
 import org.springblade.ldt.shop.vo.ShopVO;
 import org.springblade.ldt.shop.wrapper.ShopWrapper;
 import org.springblade.ldt.user.entity.Member;
 import org.springblade.ldt.user.service.IMemberService;
+import org.springblade.modules.auth.utils.TokenUtil;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.UserInfo;
+import org.springblade.modules.system.service.impl.UserServiceImpl;
 import org.springblade.yeePay.common.YeepayApiConstant;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -56,6 +61,7 @@ public class AppShopController {
 	private IMemberService memberService;
 	private IShopService shopService;
 	private IBillsService billsService;
+	private UserServiceImpl userService;
 	private INoticeManagementContentService noticeManagementContentService;
 
 	/**
@@ -75,6 +81,40 @@ public class AppShopController {
 	}
 
 
+	/**
+	 * 商户端获取我的商户列表
+	 */
+	@GetMapping("/myShop")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "商户端获取我的商户列表", notes = "shop")
+	@TenantIgnore
+	public R myShop(Shop shop) {
+		List<Shop> list = shopService.list(Condition.getQueryWrapper(shop));
+		if (CollUtil.isEmpty(list)) {
+			return R.data(list);
+		}
+		List<ShopVO> resList = new ArrayList();
+		for (Shop item : list) {
+			ShopVO shopVO = new ShopVO();
+			BeanUtil.copyProperties(item,shopVO);
+			Kv tokenInfo = this.getRefreshToken(item);
+			shopVO.setTokenInfo(tokenInfo);
+			resList.add(shopVO);
+		}
+		return R.data(resList);
+	}
+
+	/**
+	 *根据tenantId获取对应refresh_token信息
+	 */
+	private Kv getRefreshToken(Shop shop){
+		User user = userService.getBaseMapper().selectOne(new QueryWrapper<User>().lambda().eq(User::getTenantId, shop.getTenantId()).orderByAsc(User::getCreateTime).last("limit 1"));
+		UserInfo userInfo = userService.buildUserInfo(user);
+		Kv authInfo = TokenUtil.createAuthInfo(userInfo);
+		authInfo.put("shop", shop);
+		return authInfo;
+	}
+
 	@PostMapping("submitAudit")
 	@ApiOperation(value = "商户提交审核")
 	public R submitAudit(@RequestBody ShopAuditDto shopAuditDto) {

ldt-core/src/main/java/org/springblade/ldt/shop/vo/ShopVO.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.ldt.shop.vo;
 
+import org.springblade.core.tool.support.Kv;
 import org.springblade.ldt.shop.entity.Shop;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -33,4 +34,5 @@ import io.swagger.annotations.ApiModel;
 public class ShopVO extends Shop {
 	private static final long serialVersionUID = 1L;
 
+	private Kv tokenInfo;
 }

ldt-core/src/main/java/org/springblade/payment/callback/trade/UserPayCallback.java

@@ -166,7 +166,7 @@ public class UserPayCallback {
 		GoodsBills goodsBills = goodsBillsService.getOne(Condition.getQueryWrapper(new GoodsBills()).lambda().eq(GoodsBills::getBillsId, billsId));
 		if (!Objects.isNull(goodsBills)) {
 			goodsBills.setPayStatus(AppConstant.BillPayStatus.付款成功.name());
-			goodsBills.setOrderStatus(GoodsConstant.GOODS_STATUS.已完成.name());
+			goodsBills.setOrderStatus(GoodsConstant.GOODS_STATUS.制作中.name());
 			goodsBills.setPayTime(LocalDateTime.now());
 			goodsBillsService.updateById(goodsBills);
 		}

ldt-core/src/main/java/org/springblade/payment/plugin/YeePayPlugin.java

@@ -19,6 +19,7 @@ import org.springblade.common.enums.PaymentType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.utils.TradeException;
 import org.springblade.core.log.logger.BladeLogger;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.ldt.agent.entity.AgentLeagueRecord;
@@ -190,7 +191,9 @@ public class YeePayPlugin implements Payment {
 	 */
 	private void setDtoInfo(PayParam payParam, InitOrderDto initOrderDto) {
 		if (payParam.getOrderType().equalsIgnoreCase(OrderType.AGENT_CHARGE.getName())) {
-			AgentLeagueRecord agentLeagueRecord = agentLeagueRecordService.getById(payParam.getOrderId());
+			AgentLeagueRecord agentLeagueRecord = agentLeagueRecordService.getOne(Condition.getQueryWrapper(new AgentLeagueRecord()).lambda()
+				.eq(AgentLeagueRecord::getTradeNo,payParam.getOrderId()));
+
 			Assert.notNull(agentLeagueRecord, "订单查询失败，无此订单信息！");
 			initOrderDto.setGoodsName("代理加盟缴费");
 			initOrderDto.setOrderId(String.valueOf(agentLeagueRecord.getId()));

ldt-core/src/main/resources/application.yml

@@ -259,7 +259,6 @@ crypto:
     - /yeepay
     - /put-file
     - /blade-test
-    - /common/account
     - /payment
     - /sms
     - /mall/yeepay/product/fee/modifyProductFeeNotify