|
|
@@ -25,7 +25,9 @@ import org.jeecg.modules.hlwaccount.entity.HlwCompany;
|
|
|
import org.jeecg.modules.hlwaccount.mapper.HlwCompanyMapper;
|
|
|
import org.jeecg.modules.hlworder.mapper.HlwOrderMapper;
|
|
|
import org.jeecg.modules.hlworder.mapper.HlwRequirementMapper;
|
|
|
+import org.jeecg.modules.hlwpayment.entity.HlwPayment;
|
|
|
import org.jeecg.modules.hlwpayment.entity.HlwPaymentDetail;
|
|
|
+import org.jeecg.modules.hlwpayment.mapper.HlwPaymentMapper;
|
|
|
import org.jeecg.modules.hlwpayment.service.IHlwPaymentDetailService;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
@@ -74,6 +76,8 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
|
|
|
private HlwRequirementMapper hlwRequirementMapper;
|
|
|
@Resource
|
|
|
private HlwOrderMapper hlwOrderMapper;
|
|
|
+ @Resource
|
|
|
+ private HlwPaymentMapper hlwPaymentMapper;
|
|
|
|
|
|
/**
|
|
|
* 分页列表查询
|
|
|
@@ -440,6 +444,7 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
|
|
|
hlwCompanyList = hlwCompanyMapper.findCompanyList(0, totalCompany);
|
|
|
}
|
|
|
for (HlwCompany hlwCompany : hlwCompanyList) {
|
|
|
+ //切割省市区,保留省份信息
|
|
|
String provinceCityCountry = hlwCompany.getProvinceCityCountry();
|
|
|
provinceCityCountry = provinceCityCountry.replaceFirst("-", "#");
|
|
|
String province = provinceCityCountry.substring(0, provinceCityCountry.lastIndexOf("#"));
|
|
|
@@ -449,4 +454,25 @@ public class HlwPaymentDetailController extends JeecgController<HlwPaymentDetail
|
|
|
return Result.ok(list);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 获取首页随机付款单信息
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @AutoLog(value = "获取首页随机付款单信息")
|
|
|
+ @ApiOperation(value = "获取首页随机付款单信息", notes = "获取首页随机付款单信息")
|
|
|
+ @GetMapping(value = "/getRandomPaymentInfo")
|
|
|
+ public Result<?> getRandomPaymentInfo() {
|
|
|
+ //最新20比付款成功的订单
|
|
|
+ List<HlwPayment> list = hlwPaymentMapper.getRandomPaymentInfo();
|
|
|
+ //取list索引0-19随机一条
|
|
|
+ int size = list.size();
|
|
|
+ Random rand = new Random();
|
|
|
+ HlwPayment hlwPayment = list.get(rand.nextInt(size));
|
|
|
+ QueryWrapper<HlwPaymentDetail> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("payment_id", hlwPayment.getId());
|
|
|
+ int totalUser = hlwPaymentDetailService.count(queryWrapper);
|
|
|
+ hlwPayment.setTotalUser(totalUser);
|
|
|
+ return Result.ok(hlwPayment);
|
|
|
+ }
|
|
|
}
|