From e61275c2e77d27e299e74d84568bedd43b6d82ca Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 25 七月 2023 11:52:06 +0800
Subject: [PATCH] 探索玩湃-积分商城的列表优化；managent模块去除冗余类
---
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargesDetail.java | 22 ++++
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargePayRequest.java | 4
cloud-server-management/src/main/resources/mapper/ServerCarModelMapper.xml | 2
cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java | 7 +
cloud-server-management/src/main/java/com/dsh/ManagementApplication.java | 2
cloud-server-management/src/main/java/com/dsh/course/mapper/CarServiceMapper.java | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ConsumeDetail.java | 19 +++
cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java | 5
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java | 7 +
cloud-server-management/src/main/resources/mapper/UserMapper.xml | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java | 3
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 12 +-
cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java | 1
cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java | 6 +
cloud-server-management/src/main/resources/mapper/PhoneMapper.xml | 6
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 15 +-
cloud-server-management/src/main/resources/mapper/PushOrderMapper.xml | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeDetailsVo.java | 14 --
/dev/null | 40 --------
cloud-server-management/src/main/resources/mapper/SysIntegralMapper.xml | 2
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeCentVo.java | 3
cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceServiceImpl.java | 2
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 25 ++--
cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java | 58 ++++++----
cloud-server-management/src/main/resources/mapper/CarServiceMapper.xml | 10 --
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 2
26 files changed, 142 insertions(+), 131 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
index 28f81fe..345666f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/ClassDetailsController.java
@@ -178,6 +178,7 @@
vo.setStuHeight(sts.getHeight());
vo.setStuWeight(sts.getWeight());
vo.setIsNot(sts.getIsDefault());
+ vo.setStuPhone(sts.getPhone());
stuListVos.add(vo);
});
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 43313de..b97525a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -179,7 +179,7 @@
@ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
@ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"),
})
- public ResultUtil<BillingDetailsVo> getUserBillingDetails(String yearMonth,Integer recordId){
+ public ResultUtil<List<ConsumeDetail>> getUserBillingDetails(String yearMonth,Integer recordId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
@@ -198,15 +198,17 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "年月", name = "yearMonth", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "页码", name = "pageNum", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "每页数量", name = "pageSize", required = true, dataType = "int"),
@ApiImplicitParam(value = "记录(1充值 2扣除)", name = "recordId", required = true, dataType = "int"),
})
- public ResultUtil<RechargeDetailsVo> wpGoldRechargeRecord(String yearMonth, Integer recordId){
+ public ResultUtil<List<RechargesDetail>> wpGoldRechargeRecord(String yearMonth, Integer recordId,Integer pageNum,Integer pageSize){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
return ResultUtil.tokenErr();
}
- return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId));
+ return ResultUtil.success(rechargeRService.getAppUserRechargeRecord(yearMonth,recordId,appUserId,pageNum,pageSize));
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -215,7 +217,7 @@
@ResponseBody
- @PostMapping("/api/useBenefit/voucherCenter")
+ @PostMapping("/base/useBenefit/voucherCenter")
@ApiOperation(value = "充值中心", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@@ -333,7 +335,7 @@
@ApiOperation(value = "积分商城-兑换详情(实体、门票、优惠券)中的门店列表", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
- @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "lat", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "商品类型 1实物 2课包 3门票 4优惠券", name = "goodsType", required = true, dataType = "String"),
@ApiImplicitParam(value = "商品id", name = "pointsMerId", required = true, dataType = "int"),
})
public ResultUtil<List<StoreResponse>> getExchangeStoreIds( Integer goodsType,Integer pointsMerId){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java
index a641616..091e12c 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/classDetails/classInsVo/StuListVo.java
@@ -27,4 +27,7 @@
@ApiModelProperty(value = "是否默认（1. 是默认 2. 不是默认 ）")
private Integer isNot;
+ @ApiModelProperty(value = "学员手机号")
+ private String stuPhone;
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/BillingDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/BillingDetailsVo.java
deleted file mode 100644
index 3f590f4..0000000
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/BillingDetailsVo.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.dsh.account.model.vo.userBenefitDetail;
-
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BillingDetailsVo {
-
- @ApiModelProperty(value = "记录列表")
- List<ConsumeDetail> details;
-
-
-
- @Data
- public static class ConsumeDetail{
-
- @ApiModelProperty(value = "名称")
- private String consumeName;
-
- @ApiModelProperty(value = "时间")
- private String consumeTime;
-
- @ApiModelProperty(value = "金额 例如 -90 ")
- private String consumeAmount;
-
- }
-
-
-}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ConsumeDetail.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ConsumeDetail.java
new file mode 100644
index 0000000..b56d0a9
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ConsumeDetail.java
@@ -0,0 +1,19 @@
+package com.dsh.account.model.vo.userBenefitDetail;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ConsumeDetail {
+
+ @ApiModelProperty(value = "名称")
+ private String consumeName;
+
+ @ApiModelProperty(value = "时间")
+ private String consumeTime;
+
+ @ApiModelProperty(value = "金额 例如 -90 ")
+ private String consumeAmount;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
index fa0b756..0c66d75 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ProductDetailsVo.java
@@ -31,8 +31,11 @@
@ApiModelProperty(value = "每人限额")
private Integer perLimit;
- @ApiModelProperty(value = "所需类型（积分/积分+现金）")
- private String requiredType;
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "现金")
+ private BigDecimal cash;
@ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
private Integer exchangeType;
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeCentVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeCentVo.java
index a692297..bffd51d 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeCentVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeCentVo.java
@@ -7,6 +7,9 @@
@Data
public class RechargeCentVo {
+ @ApiModelProperty(value = "类型id")
+ private Integer chargeId;
+
@ApiModelProperty(value = "玩湃币")
private String wpGold;
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeDetailsVo.java
index 88c542b..1d4864f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargeDetailsVo.java
@@ -15,18 +15,4 @@
@ApiModelProperty(value = "记录列表")
private List<RechargesDetail> detailList;
- @Data
- public static class RechargesDetail{
-
- @ApiModelProperty(value = "名称")
- private String consumeName;
-
- @ApiModelProperty(value = "时间")
- private String consumeTime;
-
- @ApiModelProperty(value = "金额 例如 -90 ")
- private String consumeAmount;
-
- }
-
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargePayRequest.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargePayRequest.java
index a46f39f..56779b8 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargePayRequest.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargePayRequest.java
@@ -13,7 +13,7 @@
@ApiModelProperty(value = "支付方式 1微信 2支付宝")
private Integer payType;
- @ApiModelProperty(value = "支付金额")
- private BigDecimal payAmount;
+ @ApiModelProperty(value = "充值类型id")
+ private Integer chargeId;
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargesDetail.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargesDetail.java
new file mode 100644
index 0000000..c63f6f3
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/RechargesDetail.java
@@ -0,0 +1,22 @@
+package com.dsh.account.model.vo.userBenefitDetail;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+
+@Data
+public class RechargesDetail {
+
+
+ @ApiModelProperty(value = "名称")
+ private String consumeName;
+
+ @ApiModelProperty(value = "时间")
+ private String consumeTime;
+
+ @ApiModelProperty(value = "金额 例如 -90 ")
+ private String consumeAmount;
+
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java b/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
index c1e0f4d..5e3a7ad 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/RechargeRecordsService.java
@@ -4,7 +4,10 @@
import com.dsh.account.entity.RechargeRecords;
import com.dsh.account.model.vo.userBenefitDetail.RechargeDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.RechargePayRequest;
+import com.dsh.account.model.vo.userBenefitDetail.RechargesDetail;
import com.dsh.account.util.ResultUtil;
+
+import java.util.List;
/**
* <p>
@@ -16,7 +19,7 @@
*/
public interface RechargeRecordsService extends IService<RechargeRecords> {
- RechargeDetailsVo getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId);
+ List<RechargesDetail> getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId,Integer pageNum,Integer pageSize);
ResultUtil rechargeCenPayment(Integer userIdFormRedis, RechargePayRequest request);
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index 6dc643d..145c72f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -111,7 +111,7 @@
* @param recordId 记录
* @return
*/
- BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
+ List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId,Integer appUserId);
/**
* 注销账号
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index daf66de..4fe4c9f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -16,12 +16,17 @@
import com.dsh.account.mapper.TAppUserMapper;
import com.dsh.account.model.vo.userBenefitDetail.RechargeDetailsVo;
import com.dsh.account.model.vo.userBenefitDetail.RechargePayRequest;
+import com.dsh.account.model.vo.userBenefitDetail.RechargesDetail;
import com.dsh.account.service.RechargeRecordsService;
import com.dsh.account.util.DateTimeHelper;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.UUIDUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -67,9 +72,8 @@
@Override
- public RechargeDetailsVo getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId) {
- RechargeDetailsVo vo = new RechargeDetailsVo();
- List<RechargeDetailsVo.RechargesDetail> details = new ArrayList<>();
+ public List<RechargesDetail> getAppUserRechargeRecord(String yearMonth, Integer recordId, Integer appUserId,Integer pageNum,Integer pageSize) {
+ List<RechargesDetail> details = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
Date monthStart = null;
@@ -82,17 +86,11 @@
monthEnd = DateTimeHelper.getCurrentMouthEnd();
}
- TAppUser tAppUser = tappMapper.selectById(appUserId);
- if (null != tAppUser){
- vo.setWpGold(tAppUser.getPlayPaiCoins());
- }else {
- vo.setWpGold(0);
- }
// 1.赛事报名
List<PaymentCompetition> playPaiFGoldPayRecord = deducClient.getPlayPaiFGoldPayRecord(appUserId);
if (playPaiFGoldPayRecord.size() > 0 ){
for (PaymentCompetition competition : playPaiFGoldPayRecord) {
- RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail();
+ RechargesDetail consumeDetail = new RechargesDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg() );
consumeDetail.setConsumeTime(simpleDateFormat.format(competition.getInsertTime()));
consumeDetail.setConsumeAmount("-" + competition.getAmount());
@@ -103,7 +101,7 @@
List<TCoursePackagePayment> appuserCourseList = cpClient.getAppuserCourseList(appUserId);
if (appuserCourseList.size() > 0){
for (TCoursePackagePayment tCoursePackagePayment : appuserCourseList) {
- RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail();
+ RechargesDetail consumeDetail = new RechargesDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg() );
consumeDetail.setConsumeTime(simpleDateFormat.format(tCoursePackagePayment.getInsertTime()));
consumeDetail.setConsumeAmount("-" + tCoursePackagePayment.getPlayPaiCoin());
@@ -114,7 +112,7 @@
List<SiteBooking> siteBookings = stClient.wanpaiGoldSiteBookingList(appUserId);
if (siteBookings.size() > 0 ){
for (SiteBooking booking : siteBookings) {
- RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail();
+ RechargesDetail consumeDetail = new RechargesDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.name());
consumeDetail.setConsumeTime(simpleDateFormat.format(booking.getInsertTime()));
consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
@@ -130,7 +128,7 @@
.between("insertTime", monthStart, monthEnd));
if (rechargeRecords.size() > 0) {
for (RechargeRecords rechargeRecord : rechargeRecords) {
- RechargeDetailsVo.RechargesDetail consumeDetail = new RechargeDetailsVo.RechargesDetail();
+ RechargesDetail consumeDetail = new RechargesDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.name() + "：" + rechargeRecord.getPlayPaiCoins());
consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
consumeDetail.setConsumeAmount("+" + rechargeRecord.getAmount());
@@ -138,9 +136,9 @@
}
}
if (details.size() > 0 ){
- Collections.sort(details, new Comparator<RechargeDetailsVo.RechargesDetail>() {
+ Collections.sort(details, new Comparator<RechargesDetail>() {
@Override
- public int compare(RechargeDetailsVo.RechargesDetail o1, RechargeDetailsVo.RechargesDetail o2) {
+ public int compare(RechargesDetail o1, RechargesDetail o2) {
try {
Date date1 = simpleDateFormat.parse(o1.getConsumeTime());
Date date2 = simpleDateFormat.parse(o2.getConsumeTime());
@@ -152,8 +150,9 @@
}
});
}
- vo.setDetailList(details);
- return vo;
+ Pageable pageable = PageRequest.of(pageNum - 1, pageSize);
+ Page<RechargesDetail> page = getPage(details, pageable);
+ return page.getContent();
}
@Override
@@ -164,15 +163,19 @@
RechargeRecords rechargeRecords = new RechargeRecords();
rechargeRecords.setCode(code);
rechargeRecords.setAppUserId(userIdFormRedis);
- rechargeRecords.setAmount(request.getPayAmount());
+
List<Map<String, Object>> rechargeConfig = reconMapper.getRechargeConfig();
+ BigDecimal amount = BigDecimal.ZERO;
if (rechargeConfig.size() > 0){
for (Map<String, Object> stringObjectMap : rechargeConfig) {
- Object o = stringObjectMap.get("money");
- if (o.equals(request.getPayAmount())){
- if (tAppUser.getIsVip() == 1){
+ Integer chargeId = (Integer) stringObjectMap.get("chargeId");
+ if (chargeId.equals(request.getChargeId())) {
+ Long o = (Long) stringObjectMap.get("money");
+ amount = BigDecimal.valueOf(o);
+ rechargeRecords.setAmount(BigDecimal.valueOf(o));
+ if (tAppUser.getIsVip() == 1) {
rechargeRecords.setPlayPaiCoins((Integer) stringObjectMap.get("MemberCoins"));
- }else {
+ } else {
rechargeRecords.setPlayPaiCoins((Integer) stringObjectMap.get("usersCoins"));
}
}
@@ -185,9 +188,9 @@
try {
switch (request.getPayType()){
case 1:
- return WeChatPayment(code,request.getPayAmount());
+ return WeChatPayment(code,amount);
case 2:
- return AlipayPayment(code,request.getPayAmount());
+ return AlipayPayment(code,amount);
default:
break;
}
@@ -332,4 +335,11 @@
return null;
}
+ // 对数据进行分页处理的方法
+ private static Page<RechargesDetail> getPage(List<RechargesDetail> dataList, Pageable pageable) {
+ int start = (int) pageable.getOffset();
+ int end = Math.min((start + pageable.getPageSize()), dataList.size());
+ return new PageImpl<>(dataList.subList(start, end), pageable, dataList.size());
+ }
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 5a30e73..deb3dc6 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -484,9 +484,8 @@
}
@Override
- public BillingDetailsVo queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
- BillingDetailsVo vo = new BillingDetailsVo();
- List<BillingDetailsVo.ConsumeDetail> details = new ArrayList<>();
+ public List<ConsumeDetail> queryUserBillingDetails(String yearMonth, Integer recordId, Integer appUserId) {
+ List<ConsumeDetail> details = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("MM-dd HH:mm");
Date monthStart = null;
@@ -502,7 +501,7 @@
List<PaymentCompetition> allCompetitionPayRecord = deducClient.getAllCompetitionPayRecord(appUserId);
if (allCompetitionPayRecord.size() > 0 ){
for (PaymentCompetition paymentCompetition : allCompetitionPayRecord) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.EVENT_REGISTRATION.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
consumeDetail.setConsumeAmount("-" + paymentCompetition.getAmount());
@@ -513,7 +512,7 @@
List<PaymentCompetition> cancelOrderOfUserPayRecord = deducClient.getCancelOrderOfUserPayRecord(appUserId);
if (cancelOrderOfUserPayRecord.size() > 0 ){
for (PaymentCompetition paymentCompetition : cancelOrderOfUserPayRecord) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_EVENT_REGISTRATION.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(paymentCompetition.getInsertTime()));
consumeDetail.setConsumeAmount("+" + paymentCompetition.getAmount());
@@ -524,7 +523,7 @@
List<TCoursePackagePayment> amountPayRecord = paymentClient.getAmountPayRecord(appUserId);
if (amountPayRecord.size() > 0 ){
for (TCoursePackagePayment coursePackagePayment : amountPayRecord) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.COURSE_PACKAGE_PURCHASE.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(coursePackagePayment.getInsertTime()));
consumeDetail.setConsumeAmount("-" + coursePackagePayment.getCashPayment());
@@ -535,7 +534,7 @@
List<SiteBooking> allSiteBookingList = stClient.getAllSiteBookingList(appUserId);
if (allSiteBookingList.size() > 0){
for (SiteBooking booking : allSiteBookingList) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
if (booking.getStatus() != 5){
consumeDetail.setConsumeName(RechargeRecordEnum.VENUE_RESERVATION.getMsg());
consumeDetail.setConsumeAmount("-" + booking.getPayMoney());
@@ -557,7 +556,7 @@
.between("insertTime", monthStart, monthEnd));
if (vipPayments.size() > 0) {
for (VipPayment vipPayment : vipPayments) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.ANNUAL_MEMBERSHIP.getMsg());
consumeDetail.setConsumeTime(simpleDateFormat.format(vipPayment.getInsertTime()));
consumeDetail.setConsumeAmount("-" + vipPayment.getAmount());
@@ -571,7 +570,7 @@
.between("insertTime", monthStart, monthEnd));
if (rechargeRecords.size() > 0) {
for (RechargeRecords rechargeRecord : rechargeRecords) {
- BillingDetailsVo.ConsumeDetail consumeDetail = new BillingDetailsVo.ConsumeDetail();
+ ConsumeDetail consumeDetail = new ConsumeDetail();
consumeDetail.setConsumeName(RechargeRecordEnum.RECHARGE.getMsg() + "：" + rechargeRecord.getPlayPaiCoins());
consumeDetail.setConsumeTime(simpleDateFormat.format(rechargeRecord.getInsertTime()));
consumeDetail.setConsumeAmount("-" + rechargeRecord.getAmount());
@@ -579,9 +578,9 @@
}
}
if (details.size() > 0 ){
- Collections.sort(details, new Comparator<BillingDetailsVo.ConsumeDetail>() {
+ Collections.sort(details, new Comparator<ConsumeDetail>() {
@Override
- public int compare(BillingDetailsVo.ConsumeDetail record1, BillingDetailsVo.ConsumeDetail record2) {
+ public int compare(ConsumeDetail record1, ConsumeDetail record2) {
SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");
Date date1 = null;
Date date2 = null;
@@ -596,8 +595,7 @@
}
});
}
- vo.setDetails(details);
- return vo;
+ return details;
}
@Override
@@ -617,6 +615,7 @@
if (rechargeConfig.size() > 0 ){
for (Map<String, Object> stringObjectMap : rechargeConfig) {
RechargeCentVo vo = new RechargeCentVo();
+ vo.setChargeId((Integer) stringObjectMap.get("money"));
vo.setAmount(""+stringObjectMap.get("money"));
if (tAppUser.getIsVip() == 1){
vo.setWpGold(stringObjectMap.get("MemberCoins")+"");
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index 6937401..5830d90 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -150,10 +150,11 @@
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
if (merchandise.getRedemptionMethod() == 1){
detailsVo.setExchangeType(1);
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ detailsVo.setIntegral(merchandise.getIntegral());
}else {
detailsVo.setExchangeType(2);
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
}
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
@@ -210,9 +211,10 @@
detailsVo.setResidueNum(merchandise.getQuantityIssued()-count);
detailsVo.setPerLimit(merchandise.getPickUpQuantity());
if (merchandise.getRedemptionMethod() == 1){
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ detailsVo.setIntegral(merchandise.getIntegral());
}else {
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
}
detailsVo.setCost(merchandise.getPrice());
if (merchandise.getUseScope() == 1){
@@ -257,9 +259,10 @@
detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums);
detailsVo.setPerLimit(coupon.getPickUpQuantity());
if (merchandise.getRedemptionMethod() == 1){
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分");
+ detailsVo.setIntegral(merchandise.getIntegral());
}else {
- detailsVo.setRequiredType(merchandise.getIntegral() + "积分+￥"+merchandise.getCash());
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
}
if (coupon.getUseScope() == 1){
detailsVo.setBelongs("全国通用");
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java
index a64ef25..5fe6f2e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ProductDetailsVo.java
@@ -31,8 +31,11 @@
@ApiModelProperty(value = "每人限额")
private Integer perLimit;
- @ApiModelProperty(value = "所需类型（积分/积分+现金）")
- private String requiredType;
+ @ApiModelProperty(value = "积分")
+ private Integer integral;
+
+ @ApiModelProperty(value = "现金")
+ private BigDecimal cash;
@ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
diff --git a/cloud-server-management/src/main/java/com/dsh/ManagementApplication.java b/cloud-server-management/src/main/java/com/dsh/ManagementApplication.java
index 0498b44..aeb92e0 100644
--- a/cloud-server-management/src/main/java/com/dsh/ManagementApplication.java
+++ b/cloud-server-management/src/main/java/com/dsh/ManagementApplication.java
@@ -23,7 +23,7 @@
@EnableFeignClients
@MBCloudApplication
@Import({WebConfig.class})
-@MapperScan("com.dsh.app.mapper")
+@MapperScan("com.dsh.course.mapper")
@ServletComponentScan
@EnableScheduling
public class ManagementApplication {
diff --git a/cloud-server-management/src/main/java/com/dsh/course/mapper/CarServiceMapper.java b/cloud-server-management/src/main/java/com/dsh/course/mapper/CarServiceMapper.java
index 7947d5d..cce37c7 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/mapper/CarServiceMapper.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/mapper/CarServiceMapper.java
@@ -7,5 +7,5 @@
public interface CarServiceMapper extends BaseMapper<CarService> {
- CarService query(@Param("type") Integer orderType, @Param("carId") Integer carId);
+// CarService query(@Param("type") Integer orderType, @Param("carId") Integer carId);
}
diff --git a/cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceServiceImpl.java b/cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceServiceImpl.java
index 74b251b..0bdf2cb 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceServiceImpl.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/service/impl/CarServiceServiceImpl.java
@@ -11,6 +11,6 @@
@Override
public CarService query(Integer orderType, Integer carId) {
- return this.baseMapper.query(orderType, carId);
+ return null;
}
}
diff --git a/cloud-server-management/src/main/resources/mapper/AgreementMapper.xml b/cloud-server-management/src/main/resources/mapper/AgreementMapper.xml
deleted file mode 100644
index 19eaf84..0000000
--- a/cloud-server-management/src/main/resources/mapper/AgreementMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.AgreementMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.course.entity.Agreement">
- <id column="id" property="id"/>
- <result column="useType" property="useType"/>
- <result column="content" property="content"/>
- <result column="type" property="type"/>
-
- <result column="flag" property="flag"/>
- <result column="insertTime" property="insertTime"/>
- <result column="insertUser" property="insertUser"/>
- <result column="updateTime" property="updateTime"/>
- <result column="updateUser" property="updateUser"/>
- </resultMap>
-
-
-
- <select id="queryByType" resultType="java.lang.String">
- select content from t_agreement where `type` = #{type} and flag != and language=#{language}
-
- <if test="null != useType">
- and useType = #{useType}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/CancleOrderMapper.xml b/cloud-server-management/src/main/resources/mapper/CancleOrderMapper.xml
deleted file mode 100644
index 56c0679..0000000
--- a/cloud-server-management/src/main/resources/mapper/CancleOrderMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.CancleOrderMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.course.entity.CancleOrder">
- <id column="id" property="id"/>
- <result column="companyId" property="companyId"/>
- <result column="minuteNum" property="minuteNum"/>
- <result column="money" property="money"/>
- <result column="type" property="type"/>
- <result column="orderType" property="orderType"/>
- </resultMap>
-
-
- <select id="query" resultType="CancleOrder">
- select
- id as id,
- companyId as companyId,
- minuteNum as minuteNum,
- money as money,
- `type` as `type`,
- orderType as orderType
- from t_sys_cancle_order where `type` = #{type} and orderType = #{orderType} and companyId = #{companyId}
- </select>
-</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/CarServiceMapper.xml b/cloud-server-management/src/main/resources/mapper/CarServiceMapper.xml
index 5ef14fd..fee7192 100644
--- a/cloud-server-management/src/main/resources/mapper/CarServiceMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/CarServiceMapper.xml
@@ -9,14 +9,4 @@
<result column="type" property="type"/>
<result column="serverCarModelId" property="serverCarModelId"/>
</resultMap>
-
-
- <select id="query" resultType="CarService">
- select
- id as id,
- carId as carId,
- `type` as `type`,
- serverCarModelId as serverCarModelId
- from t_car_service where `type` = #{type} and carId = #{carId}
- </select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/DriverPunishMapper.xml b/cloud-server-management/src/main/resources/mapper/DriverPunishMapper.xml
deleted file mode 100644
index 6d734e2..0000000
--- a/cloud-server-management/src/main/resources/mapper/DriverPunishMapper.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.DriverPunishMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.DriverPunish">
- <id column="id" property="id"/>
- <result column="driverId" property="driverId"/>
- <result column="punishTime" property="punishTime"/>
- <result column="punishReason" property="punishReason"/>
- <result column="punishReault" property="punishReault"/>
- </resultMap>
-
-
- <select id="queryAllPunish" resultType="com.dsh.guns.modular.system.model.DriverPunish">
- select
- id as id,
- driverId as driverId,
- punishTime as punishTime,
- punishReason as punishReason,
- punishReault as punishReault
- from t_driver_punish where driverId = #{driverId}
- </select>
- <select id="getCanSelectCarList" resultType="java.util.Map">
- SELECT * FROM (SELECT cm.`name` as modelName,cb.`name` as brandName,ds.serverStr,ci.* from t_car as ci
- LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = ci.carModelId
- LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = ci.carBrandId
- LEFT JOIN (
- SELECT
- GROUP_CONCAT(case when type = 1 then '摩托车'
- when type = 2 then ''
- when type = 3 then ''
- when type = 4 then '同城快送'
- when type = 5 then ''
- when type = 6 then ''
- else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = ci.id) as o
- <where>
- o.state = 1
- <if test="carIdStr != null and carIdStr != ''">
- and not FIND_IN_SET(o.id,#{carIdStr})
- </if>
- <if test="carLicensePlate != null and carLicensePlate != ''">
- and o.carLicensePlate LIKE CONCAT('%',#{carLicensePlate},'%')
- </if>
- <if test="brandName != null and brandName != ''">
- and o.brandName LIKE CONCAT('%',#{brandName},'%')
- </if>
- <if test="modelName != null and modelName != ''">
- and o.modelName LIKE CONCAT('%',#{modelName},'%')
- </if>
- <if test="color != null and color != ''">
- and o.carColor LIKE CONCAT('%',#{color},'%')
- </if>
- <if test="serverStr != null and serverStr != ''">
- and o.serverStr LIKE CONCAT('%',#{serverStr},'%')
- </if>
- <if test="roleType != null and roleType != '' and roleType == 2">
- and (o.companyId = #{objectId} or FIND_IN_SET(o.franchiseeId,(#{ids})))
- </if>
- <if test="roleType != null and roleType != '' and roleType == 3">
- and o.franchiseeId = #{objectId}
- </if>
- </where>
- order by o.id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/DriverVerifyMapper.xml b/cloud-server-management/src/main/resources/mapper/DriverVerifyMapper.xml
deleted file mode 100644
index 172bd17..0000000
--- a/cloud-server-management/src/main/resources/mapper/DriverVerifyMapper.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.DriverVerifyMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.DriverVerify">
- <id column="id" property="id"/>
- <result column="driverId" property="driverId"/>
- <result column="newCarId" property="newCarId"/>
- <result column="oldCarId" property="oldCarId"/>
- <result column="createTime" property="createTime"/>
- <result column="state" property="state"/>
- <result column="remark" property="remark"/>
- <result column="source" property="source"/>
- <result column="company" property="company"/>
- <result column="phone" property="phone"/>
- <result column="sex" property="sex"/>
- <result column="driverNum" property="driverNum"/>
- <result column="age" property="age"/>
- <result column="IdCard" property="idCards"/>
- <result column="carServer" property="carServer"/>
- <result column="account" property="account"/>
- <result column="driverNumImg" property="driverNumImg"/>
- <result column="address" property="address"/>
- </resultMap>
- <select id="getList" resultType="java.util.Map">
- select * from t_driver_verify where state !=4
- <if test="sTime != null">
- and createTime between #{sTime} and #{eTime}
- </if>
- <if test="companyName !=null and companyName !=''">
- and company like concat("%",#{companyName},"%")
- </if>
- <if test="phone != null and phone !=''">
- and phone like concat("%",#{phone},"%")
- </if>
- <if test="account !=null and account !=''">
- and account like concat("%",#{account},"%")
- </if>
- <if test="state !=null and state !=''">
- and state =#{state}
- </if>
- order by createTime desc
- </select>
-
-
-</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/PhoneMapper.xml b/cloud-server-management/src/main/resources/mapper/PhoneMapper.xml
index e127f48..36fea36 100644
--- a/cloud-server-management/src/main/resources/mapper/PhoneMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/PhoneMapper.xml
@@ -13,7 +13,7 @@
- <select id="queryPhones" resultType="Phone">
+ <select id="queryPhones" resultType="com.dsh.course.entity.Phone">
select
id as id,
type as type,
@@ -35,7 +35,7 @@
</select>
- <select id="query" resultType="Phone">
+ <select id="query" resultType="com.dsh.course.entity.Phone">
select
id as id,
type as type,
@@ -66,7 +66,7 @@
</select>
- <select id="queryInfo" resultType="Phone">
+ <select id="queryInfo" resultType="com.dsh.course.entity.Phone">
select
id as id,
type as type,
diff --git a/cloud-server-management/src/main/resources/mapper/PushOrderMapper.xml b/cloud-server-management/src/main/resources/mapper/PushOrderMapper.xml
index 3fb8e52..98c45c1 100644
--- a/cloud-server-management/src/main/resources/mapper/PushOrderMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/PushOrderMapper.xml
@@ -14,7 +14,7 @@
</resultMap>
- <select id="querys" resultType="PushOrder">
+ <select id="querys" resultType="com.dsh.course.entity.PushOrder">
select
id as id,
companyId as companyId,
diff --git a/cloud-server-management/src/main/resources/mapper/ServerCarModelMapper.xml b/cloud-server-management/src/main/resources/mapper/ServerCarModelMapper.xml
index 40ee764..284d7cd 100644
--- a/cloud-server-management/src/main/resources/mapper/ServerCarModelMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/ServerCarModelMapper.xml
@@ -15,7 +15,7 @@
- <select id="queryServerCarModel" resultType="ServerCarModel">
+ <select id="queryServerCarModel" resultType="com.dsh.course.entity.ServerCarModel">
select * from t_server_carmodel where state = 1 and `type` = #{type}
</select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/SysCouponActivityMapper.xml b/cloud-server-management/src/main/resources/mapper/SysCouponActivityMapper.xml
deleted file mode 100644
index bacb269..0000000
--- a/cloud-server-management/src/main/resources/mapper/SysCouponActivityMapper.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.SysCouponActivityMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.SysCouponActivity">
- <id column="id" property="id" />
- <result column="money" property="money" />
- <result column="fullMoney" property="fullMoney" />
- <result column="insertTime" property="insertTime" />
- <result column="companyId" property="companyId" />
- <result column="couponUseType" property="couponUseType" />
- <result column="couponType" property="couponType" />
- <result column="name" property="name" />
- <result column="effective" property="effective" />
- <result column="companyType" property="companyType" />
- <result column="status" property="status" />
- <result column="remark" property="remark" />
- <result column="sendType" property="sendType" />
- <result column="sendUserId" property="sendUserId" />
- <result column="allNum" property="allNum" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, money, fullMoney, insertTime, companyId, couponUseType, couponType, name, effective, companyType, status, remark, sendType, sendUserId,allNum
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/SysCouponRecordMapper.xml b/cloud-server-management/src/main/resources/mapper/SysCouponRecordMapper.xml
deleted file mode 100644
index 44c8cf8..0000000
--- a/cloud-server-management/src/main/resources/mapper/SysCouponRecordMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.SysCouponRecordMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.SysCouponRecord">
- <id column="id" property="id" />
- <result column="money" property="money" />
- <result column="fullMoney" property="fullMoney" />
- <result column="insertTime" property="insertTime" />
- <result column="companyId" property="companyId" />
- <result column="couponUseType" property="couponUseType" />
- <result column="couponType" property="couponType" />
- <result column="name" property="name" />
- <result column="effective" property="effective" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, money, fullMoney, insertTime, companyId, couponUseType, couponType, name, effective
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/SysIntegralMapper.xml b/cloud-server-management/src/main/resources/mapper/SysIntegralMapper.xml
index 878c511..1a29bce 100644
--- a/cloud-server-management/src/main/resources/mapper/SysIntegralMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/SysIntegralMapper.xml
@@ -12,7 +12,7 @@
- <select id="query" resultType="SysIntegral">
+ <select id="query" resultType="com.dsh.course.entity.SysIntegral">
select * from t_sys_integral where companyId = #{companyId}
</select>
</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/SysRedPacketRecordMapper.xml b/cloud-server-management/src/main/resources/mapper/SysRedPacketRecordMapper.xml
deleted file mode 100644
index 758630e..0000000
--- a/cloud-server-management/src/main/resources/mapper/SysRedPacketRecordMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.SysRedPacketRecordMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.SysRedPacketRecord">
- <id column="id" property="id" />
- <result column="money" property="money" />
- <result column="insertTime" property="insertTime" />
- <result column="companyId" property="companyId" />
- <result column="name" property="name" />
- <result column="type" property="type" />
- <result column="totalMoney" property="totalMoney" />
- <result column="laveMoney" property="laveMoney" />
- <result column="startMoney" property="startMoney" />
- <result column="endMoney" property="endMoney" />
- <result column="effective" property="effective" />
- <result column="companyType" property="companyType" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, money, insertTime, companyId, name, type, totalMoney, laveMoney, startMoney, endMoney, effective, companyType
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/SystemPriceMapper.xml b/cloud-server-management/src/main/resources/mapper/SystemPriceMapper.xml
deleted file mode 100644
index 98edfc4..0000000
--- a/cloud-server-management/src/main/resources/mapper/SystemPriceMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.SystemPriceMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.course.entity.SystemPrice">
- <id column="id" property="id"/>
- <result column="type" property="type"/>
- <result column="companyId" property="companyId"/>
- <result column="serverCarModelId" property="serverCarModelId"/>
- <result column="content" property="content"/>
- </resultMap>
-
- <select id="query" resultType="SystemPrice">
- select * from t_system_price where companyId = #{companyId}
- <if test="null != type">
- and `type` = #{type}
- </if>
- <if test="null != serverCarModelId">
- and serverCarModelId = #{serverCarModelId}
- </if>
- </select>
-</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/TAgreementMapper.xml b/cloud-server-management/src/main/resources/mapper/TAgreementMapper.xml
deleted file mode 100644
index a9b4df1..0000000
--- a/cloud-server-management/src/main/resources/mapper/TAgreementMapper.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TAgreementMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TAgreement">
- <id column="id" property="id" />
- <result column="useType" property="useType" />
- <result column="content" property="content" />
- <result column="type" property="type" />
- <result column="flag" property="flag" />
- <result column="insertTime" property="insertTime" />
- <result column="insertUser" property="insertUser" />
- <result column="updateTime" property="updateTime" />
- <result column="updateUser" property="updateUser" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, useType, content, type, flag, insertTime, insertUser, updateTime, updateUser
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TAuditRecordMapper.xml b/cloud-server-management/src/main/resources/mapper/TAuditRecordMapper.xml
deleted file mode 100644
index d4a7455..0000000
--- a/cloud-server-management/src/main/resources/mapper/TAuditRecordMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TAuditRecordMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TAuditRecord">
- <id column="id" property="id" />
- <result column="activityId" property="activityId" />
- <result column="activityName" property="activityName" />
- <result column="auditStatus" property="auditStatus" />
- <result column="auditTime" property="auditTime" />
- <result column="activityType" property="activityType" />
- <result column="remark" property="remark" />
- <result column="auditUserId" property="auditUserId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, activityId, activityName, auditStatus, auditTime, activityType, remark, auditUserId
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TCarBrandMapper.xml b/cloud-server-management/src/main/resources/mapper/TCarBrandMapper.xml
deleted file mode 100644
index fdcd770..0000000
--- a/cloud-server-management/src/main/resources/mapper/TCarBrandMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TCarBrandMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TCarBrand">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="imgUrl" property="imgUrl" />
- <result column="remark" property="remark" />
- <result column="createTime" property="createTime" />
- <result column="state" property="state" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, name, imgUrl, remark, insertTime, state
- </sql>
-
- <!--根据条件查询车辆品牌列表-->
- <select id="getCarBrandList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT IFNULL(cm.num,0) as modelNum,IFNULL(cc.num,0) as carNum,cb.* FROM t_car_brand as cb
- LEFT JOIN (SELECT COUNT(id) as num,brandId FROM t_car_model WHERE state = 1 GROUP BY brandId) as cm on cm.brandId = cb.id
- LEFT JOIN (SELECT COUNT(id) as num,carBrandId FROM t_car WHERE state = 1 GROUP BY carBrandId) as cc on cc.carBrandId = cb.id) as o
- <where>
- o.state = 1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="name != null and name != ''">
- and o.name LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="yy !=null and yy !=''">
- and o.language=#{yy}
- </if>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TCarMapper.xml b/cloud-server-management/src/main/resources/mapper/TCarMapper.xml
deleted file mode 100644
index 5837576..0000000
--- a/cloud-server-management/src/main/resources/mapper/TCarMapper.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TCarMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TCar">
- <id column="id" property="id" />
- <result column="isPlatCar" property="isPlatCar" />
- <result column="companyId" property="companyId" />
- <result column="franchiseeId" property="franchiseeId" />
- <result column="carColor" property="carColor" />
- <result column="carModelId" property="carModelId" />
- <result column="carBrandId" property="carBrandId" />
- <result column="carLicensePlate" property="carLicensePlate" />
- <result column="carPhoto" property="carPhoto" />
- <result column="drivingLicenseNumber" property="drivingLicenseNumber" />
- <result column="drivingLicensePhoto" property="drivingLicensePhoto" />
- <result column="annualInspectionTime" property="annualInspectionTime" />
- <result column="commercialInsuranceTime" property="commercialInsuranceTime" />
- <result column="createTime" property="createTime" />
- <result column="state" property="state" />
- <result column="addType" property="addType" />
- <result column="addObjectId" property="addObjectId" />
- <result column="plateColor" property="plateColor"/>
- <result column="vehicleType" property="vehicleType"/>
- <result column="ownerName" property="ownerName"/>
- <result column="engineId" property="engineId"/>
- <result column="VIN" property="VIN"/>
- <result column="certifyDateA" property="certifyDateA"/>
- <result column="fuelType" property="fuelType"/>
- <result column="engineDisplace" property="engineDisplace"/>
- <result column="certificate" property="certificate"/>
- <result column="transAgency" property="transAgency"/>
- <result column="transArea" property="transArea"/>
- <result column="transDateStart" property="transDateStart"/>
- <result column="transDateStop" property="transDateStop"/>
- <result column="certifyDateB" property="certifyDateB"/>
- <result column="fixState" property="fixState"/>
- <result column="nextFixDate" property="nextFixDate"/>
- <result column="checkState" property="checkState"/>
- <result column="feePrintId" property="feePrintId"/>
- <result column="GPSBrand" property="GPSBrand"/>
- <result column="GPSModel" property="GPSModel"/>
- <result column="GPSIMEI" property="GPSIMEI"/>
- <result column="GPSInstallDate" property="GPSInstallDate"/>
- <result column="registerDate" property="registerDate"/>
- <result column="commercialType" property="commercialType"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, isPlatCar, companyId, franchiseeId, carColor, carModelId, carBrandId, carLicensePlate, carPhoto, drivingLicenseNumber, drivingLicensePhoto, annualInspectionTime, commercialInsuranceTime, createTime, state, addType, addObjectId
- </sql>
-
- <!--根据条件查询车辆列表-->
- <select id="getCarList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT ds.serverStr,
-
- <if test="language==1">
- cb.`name` as brandName,
- cm.`name` as modelName,
- tcr.`name` as color,
- </if>
- <if test="language==2">
- cb.`ename` as brandName,
- cm.`ename` as modelName,
- tcr.`ename` as color,
- </if>
- <if test="language==3">
- cb.`yname` as brandName,
- cm.`yname` as modelName,
- tcr.`yname` as color,
- </if>
-
-
- cm.seat,cc.* ,tcs.type from t_car as cc
- LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
- LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
- left join t_colour tcr on tcr.id = cc.carColor
- LEFT JOIN (
- SELECT
- GROUP_CONCAT(case when type = 1 then 'Motorcycle'
- when type = 4 then 'Express in the same city'
- else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
-
- left join t_car_service tcs on tcs.carId = cc.id
- ) as o
- <where>
- o.state = 1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="id != null and id != ''">
- and o.id LIKE CONCAT('%',#{id},'%')
- </if>
- <if test="brandName != null and brandName != ''">
- and o.brandName LIKE CONCAT('%',#{brandName},'%')
- </if>
- <if test="modelName != null and modelName != ''">
- and o.modelName LIKE CONCAT('%',#{modelName},'%')
- </if>
- <if test="carColor != null and carColor != ''">
- and o.carColor LIKE CONCAT('%',#{carColor},'%')
- </if>
- <if test="serverStr != null and serverStr != ''">
- and o.serverStr LIKE CONCAT('%',#{serverStr},'%')
- </if>
- <if test="carLicensePlate != null and carLicensePlate != ''">
- and o.carLicensePlate LIKE CONCAT('%',#{carLicensePlate},'%')
- </if>
-<!-- <if test="driverName != null and driverName != ''">-->
-<!-- and o.driverName LIKE CONCAT('%',#{driverName},'%')-->
-<!-- </if>-->
-<!-- <if test="companyName != null and companyName != ''">-->
-<!-- and o.companyName LIKE CONCAT('%',#{companyName},'%')-->
-<!-- </if>-->
-<!-- <if test="franchiseeName != null and franchiseeName != ''">-->
-<!-- and o.franchiseeName LIKE CONCAT('%',#{franchiseeName},'%')-->
-<!-- </if>-->
- <if test="roleType != null and roleType != '' and roleType == 2">
- and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(#{ids})))
- </if>
- <if test="roleType != null and roleType != '' and roleType == 3">
- and o.franchiseeId = #{nowUserId}
- </if>
- </where>
- group by o.id
- order by o.id desc
- </select>
- <select id="getCarListAuth" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,dd.`name` as driverName,cc.* from t_car as cc
- LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
- LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
- LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = cc.companyId
- LEFT JOIN (select * from t_company where type = 3 and flag != 3) as c2 on c2.id = cc.franchiseeId
- LEFT JOIN (
- SELECT
- GROUP_CONCAT(case when type = 1 then '摩托车'
- when type = 4 then '同城快送'
- else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
- LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
- <where>
- o.state = 1 and authState=1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="id != null and id != ''">
- and o.id LIKE CONCAT('%',#{id},'%')
- </if>
- <if test="brandName != null and brandName != ''">
- and o.brandName LIKE CONCAT('%',#{brandName},'%')
- </if>
- <if test="modelName != null and modelName != ''">
- and o.modelName LIKE CONCAT('%',#{modelName},'%')
- </if>
- <if test="carColor != null and carColor != ''">
- and o.carColor LIKE CONCAT('%',#{carColor},'%')
- </if>
- <if test="serverStr != null and serverStr != ''">
- and o.serverStr LIKE CONCAT('%',#{serverStr},'%')
- </if>
- <if test="carLicensePlate != null and carLicensePlate != ''">
- and o.carLicensePlate LIKE CONCAT('%',#{carLicensePlate},'%')
- </if>
- <if test="driverName != null and driverName != ''">
- and o.driverName LIKE CONCAT('%',#{driverName},'%')
- </if>
- <if test="companyName != null and companyName != ''">
- and o.companyName LIKE CONCAT('%',#{companyName},'%')
- </if>
- <if test="franchiseeName != null and franchiseeName != ''">
- and o.franchiseeName LIKE CONCAT('%',#{franchiseeName},'%')
- </if>
- <if test="roleType != null and roleType != '' and roleType == 2">
- and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
- </if>
- <if test="roleType != null and roleType != '' and roleType == 3">
- and o.franchiseeId = #{nowUserId}
- </if>
- </where>
- order by o.id desc
- </select>
-
- <!--根据条件查询车辆列表不分页-->
- <select id="getCarListNoPage" resultType="map">
- SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,c1.`name` as companyName,c2.`name` as franchiseeName,cm.seat,dd.`name` as driverName,cc.* from t_car as cc
- LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
- LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
- LEFT JOIN (select * from t_company where type = 2 and flag != 3) as c1 on c1.id = cc.companyId
- LEFT JOIN (select * from t_company where type = 3 and flag != 3) as c2 on c2.id = cc.franchiseeId
- LEFT JOIN (
- SELECT
- GROUP_CONCAT(case when type = 1 then '摩托车'
- when type = 4 then '同城快送'
- else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
- LEFT JOIN (select * from t_driver where flag != 3) AS dd on dd.carId = cc.id) as o
- <where>
- o.state = 1
- <if test="roleType != null and roleType != '' and roleType == 2">
- and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
- </if>
- <if test="roleType != null and roleType != '' and roleType == 3">
- and o.franchiseeId = #{nowUserId}
- </if>
- </where>
- order by o.id desc
- </select>
- <select id="getCarList1" resultType="java.util.Map">
- SELECT * FROM (SELECT ds.serverStr,cb.`name` as brandName,cm.`name` as modelName,cm.seat,cc.* ,tcs.type from t_car as cc
- LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cc.carBrandId
- LEFT JOIN (select * from t_car_model where state = 1) as cm on cm.id = cc.carModelId
- LEFT JOIN (
- SELECT
- GROUP_CONCAT(case when type = 1 then '摩托车'
- when type = 4 then '同城快送'
- else '' end ) as serverStr,carId from t_car_service GROUP BY carId) as ds on ds.carId = cc.id
-
- left join t_car_service tcs on tcs.carId = cc.id
- ) as o
- <where>
- o.state = 1 and o.id in
- <foreach collection="integers" close=")" index="index" item="id" open="(" separator=",">
- #{id}
- </foreach>
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
-<!-- <if test="id != null and id != ''">-->
-<!-- and o.id LIKE CONCAT('%',#{id},'%')-->
-<!-- </if>-->
- <if test="brandName != null and brandName != ''">
- and o.brandName LIKE CONCAT('%',#{brandName},'%')
- </if>
- <if test="modelName != null and modelName != ''">
- and o.modelName LIKE CONCAT('%',#{modelName},'%')
- </if>
- <if test="carColor != null and carColor != ''">
- and o.carColor LIKE CONCAT('%',#{carColor},'%')
- </if>
- <if test="serverStr != null and serverStr != ''">
- and o.serverStr LIKE CONCAT('%',#{serverStr},'%')
- </if>
- <if test="carLicensePlate != null and carLicensePlate != ''">
- and o.carLicensePlate LIKE CONCAT('%',#{carLicensePlate},'%')
- </if>
- <!-- <if test="driverName != null and driverName != ''">-->
- <!-- and o.driverName LIKE CONCAT('%',#{driverName},'%')-->
- <!-- </if>-->
- <!-- <if test="companyName != null and companyName != ''">-->
- <!-- and o.companyName LIKE CONCAT('%',#{companyName},'%')-->
- <!-- </if>-->
- <!-- <if test="franchiseeName != null and franchiseeName != ''">-->
- <!-- and o.franchiseeName LIKE CONCAT('%',#{franchiseeName},'%')-->
- <!-- </if>-->
- <if test="roleType != null and roleType != '' and roleType == 2">
- and (o.companyId = #{nowUserId} or FIND_IN_SET(o.franchiseeId,(#{ids})))
- </if>
- <if test="roleType != null and roleType != '' and roleType == 3">
- and o.franchiseeId = #{nowUserId}
- </if>
- </where>
- order by o.id desc
- </select>
- <select id="getById1" resultType="com.dsh.guns.modular.system.model.TCar">
- select * from t_car where id =#{carId1}
- </select>
- <select id="getCarID" resultType="com.dsh.guns.modular.system.model.TCar">
- select * from t_car where carLicensePlate =#{newCarId}
- </select>
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TCarModelMapper.xml b/cloud-server-management/src/main/resources/mapper/TCarModelMapper.xml
deleted file mode 100644
index b1adf1a..0000000
--- a/cloud-server-management/src/main/resources/mapper/TCarModelMapper.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TCarModelMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TCarModel">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="remark" property="remark" />
- <result column="insertTime" property="insertTime" />
- <result column="state" property="state" />
- <result column="seat" property="seat" />
- <result column="brandId" property="brandId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, name, remark, insertTime, state, seat, brandId
- </sql>
-
- <!--根据条件查询车辆车型列表-->
- <select id="getCarModelList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT cb.`name` as brandName,IFNULL(cc.num,0) as carNum,cm.* FROM t_car_model as cm
- LEFT JOIN (select * from t_car_brand where state = 1) as cb on cb.id = cm.brandId
- LEFT JOIN (SELECT COUNT(id) as num,carModelId from t_car where state = 1 GROUP BY carModelId) as cc on cc.carModelId = cm.id) as o
- <where>
- o.state = 1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="name != null and name != ''">
- and o.name LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="yy !=null and yy !=''">
- and o.language =#{yy}
- </if>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TCarServiceMapper.xml b/cloud-server-management/src/main/resources/mapper/TCarServiceMapper.xml
deleted file mode 100644
index 258fc10..0000000
--- a/cloud-server-management/src/main/resources/mapper/TCarServiceMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TCarServiceMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TCarService">
- <id column="id" property="id" />
- <result column="carId" property="carId" />
- <result column="type" property="type" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, carId, type
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeFoundationMapper.xml b/cloud-server-management/src/main/resources/mapper/TEnsureIncomeFoundationMapper.xml
deleted file mode 100644
index 44b4c39..0000000
--- a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeFoundationMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TEnsureIncomeFoundationMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TEnsureIncomeFoundation">
- <id column="id" property="id" />
- <result column="ensureIncomeId" property="ensureIncomeId" />
- <result column="startTime" property="startTime" />
- <result column="endTime" property="endTime" />
- <result column="amount" property="amount" />
- <result column="createTime" property="createTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, ensureIncomeId, startTime, endTime, amount, createTime
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeRuleMapper.xml b/cloud-server-management/src/main/resources/mapper/TEnsureIncomeRuleMapper.xml
deleted file mode 100644
index caac122..0000000
--- a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeRuleMapper.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TEnsureIncomeRuleMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TEnsureIncomeRule">
- <id column="id" property="id" />
- <result column="ruleName" property="ruleName" />
- <result column="startTime" property="startTime" />
- <result column="endTime" property="endTime" />
- <result column="periodAmount" property="periodAmount" />
- <result column="periodMonthAmount" property="periodMonthAmount" />
- <result column="periodDayAmount" property="periodDayAmount" />
- <result column="createTime" property="createTime" />
- <result column="remark" property="remark" />
- <result column="status" property="status" />
- <result column="companyId" property="companyId" />
- <result column="state" property="state" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, ruleName, startTime, endTime, periodAmount, periodMonthAmount, periodDayAmount, createTime, remark, status,companyId,state
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialMapper.xml b/cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialMapper.xml
deleted file mode 100644
index 358c13d..0000000
--- a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TEnsureIncomeSpecialMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TEnsureIncomeSpecial">
- <id column="id" property="id" />
- <result column="ensureIncomeId" property="ensureIncomeId" />
- <result column="startTime" property="startTime" />
- <result column="endTime" property="endTime" />
- <result column="periodDayAmount" property="periodDayAmount" />
- <result column="createTime" property="createTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, ensureIncomeId, startTime, endTime, periodDayAmount, createTime
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialTimeSoltMapper.xml b/cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialTimeSoltMapper.xml
deleted file mode 100644
index d7f6c22..0000000
--- a/cloud-server-management/src/main/resources/mapper/TEnsureIncomeSpecialTimeSoltMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TEnsureIncomeSpecialTimeSoltMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TEnsureIncomeSpecialTimeSolt">
- <id column="id" property="id" />
- <result column="ensureIncomeSpecialId" property="ensureIncomeSpecialId" />
- <result column="startTime" property="startTime" />
- <result column="endTime" property="endTime" />
- <result column="amount" property="amount" />
- <result column="createTime" property="createTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, ensureIncomeSpecialId, startTime, endTime, amount, createTime
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TFeedbackMapper.xml b/cloud-server-management/src/main/resources/mapper/TFeedbackMapper.xml
deleted file mode 100644
index cd32768..0000000
--- a/cloud-server-management/src/main/resources/mapper/TFeedbackMapper.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TFeedbackMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TFeedback">
- <id column="id" property="id" />
- <result column="userId" property="userId" />
- <result column="handleUserId" property="handleUserId" />
- <result column="content" property="content" />
- <result column="insertTime" property="insertTime" />
- <result column="imgUrl" property="imgUrl" />
- <result column="flag" property="flag" />
- <result column="state" property="state" />
- <result column="cldate" property="cldate" />
- <result column="remark" property="remark" />
- <result column="type" property="type" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, userId, handleUserId, content, insertTime, imgUrl, flag, state, cldate, remark, type
- </sql>
-
- <!--根据条件查询用反馈记录列表-->
- <select id="getFeedbackList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT su.`name` as handleUserName,
- fb.* FROM t_feedback as fb
- LEFT JOIN sys_user as su on su.id = fb.handleUserId
- ) as o
- <where>
- o.flag = 1
- <if test="type != null and type != '' and type == 1">
- and o.type = 1
- </if>
- <if test="type != null and type != '' and type == 2">
- and o.type = 2
- </if>
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="state != null and state != ''">
- and o.state = #{state}
- </if>
- and o.userId in
- <foreach collection="ids" separator="," open="(" item="id" index="index" close=")">
- #{id}
- </foreach>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TOpenCityBusinessMapper.xml b/cloud-server-management/src/main/resources/mapper/TOpenCityBusinessMapper.xml
deleted file mode 100644
index b9bd9ed..0000000
--- a/cloud-server-management/src/main/resources/mapper/TOpenCityBusinessMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TOpenCityBusinessMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TOpenCityBusiness">
- <id column="id" property="id" />
- <result column="openCityId" property="openCityId" />
- <result column="businessType" property="businessType" />
- <result column="sort" property="sort" />
- <result column="flag" property="flag" />
- <result column="insertTime" property="insertTime" />
- <result column="insertUser" property="insertUser" />
- <result column="updateTime" property="updateTime" />
- <result column="updateUser" property="updateUser" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, openCityId, businessType, sort, flag, insertTime, insertUser, updateTime, updateUser
- </sql>
-
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TOpenCityMapper.xml b/cloud-server-management/src/main/resources/mapper/TOpenCityMapper.xml
deleted file mode 100644
index 479092c..0000000
--- a/cloud-server-management/src/main/resources/mapper/TOpenCityMapper.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TOpenCityMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TOpenCity">
- <id column="id" property="id" />
- <result column="code" property="code" />
- <result column="lon" property="lon" />
- <result column="lat" property="lat" />
- <result column="isQualifications" property="isQualifications" />
- <result column="areaName" property="areaName" />
- <result column="cityName" property="cityName" />
- <result column="provinceName" property="provinceName" />
- <result column="flag" property="flag" />
- <result column="insertTime" property="insertTime" />
- <result column="insertUser" property="insertUser" />
- <result column="updateTime" property="updateTime" />
- <result column="updateUser" property="updateUser" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, code, lon, lat, isQualifications, areaName, cityName, provinceName, flag, insertTime, insertUser, updateTime, updateUser
- </sql>
-
- <!--根据条件查询开通城市列表-->
- <select id="getOpenCityList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT ocb.str as business,oc.* FROM t_open_city as oc
- LEFT JOIN (
- SELECT GROUP_CONCAT(
- CONCAT((case when businessType = 1 then 'motorcycle'
- when businessType = 2 then ''
- when businessType = 3 then ''
- when businessType = 4 then 'city express'
- when businessType = 5 then ''
- when businessType = 6 then ''
- else '' end),' ：',sort)) as str,openCityId from t_open_city_business where flag != 3 GROUP BY openCityId
- ) as ocb on ocb.openCityId = oc.id) as o
- <where>
- o.flag != 3
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="name != null and name != ''">
- <if test="language == 1">
- and o.chineseName LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="language == 2">
- and o.englishName LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="language == 3">
- and o.indonesianName LIKE CONCAT('%',#{name},'%')
- </if>
- </if>
- </where>
- order by o.id desc
- </select>
-
- <!--根据城市ID获取经营业务-->
- <select id="getBusinessByCityId" resultType="map">
- SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr,
- case when bb.businessType = 1 then '摩托车'
- when bb.businessType = 2 then ''
- when bb.businessType = 3 then ''
- when bb.businessType = 4 then '同城快送'
- when bb.businessType = 5 then ''
- when bb.businessType = 6 then ''
- else '' end as businessTypeStr,bb.*
- FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3
- </select>
- <select id="getBusinessListByCityId" resultType="java.util.Map">
- SELECT DATE_FORMAT(bb.insertTime,'%Y-%m-%d') as insertTimeStr,
- case when bb.businessType = 1 then 'motorcycle'
- when bb.businessType = 2 then ''
- when bb.businessType = 3 then ''
- when bb.businessType = 4 then 'city express'
- when bb.businessType = 5 then ''
- when bb.businessType = 6 then ''
- else '' end as businessTypeStr,bb.*
- FROM t_open_city_business as bb where bb.openCityId = #{openCityId} and bb.flag != 3
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TOrderEvaluateMapper.xml b/cloud-server-management/src/main/resources/mapper/TOrderEvaluateMapper.xml
deleted file mode 100644
index 128aae7..0000000
--- a/cloud-server-management/src/main/resources/mapper/TOrderEvaluateMapper.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TOrderEvaluateMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TOrderEvaluate">
- <id column="id" property="id" />
- <result column="orderId" property="orderId" />
- <result column="driverId" property="driverId" />
- <result column="orderType" property="orderType" />
- <result column="fraction" property="fraction" />
- <result column="content" property="content" />
- <result column="insertTime" property="insertTime" />
- <result column="userId" property="userId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, orderId, driverId, orderType, fraction, content, insertTime, userId
- </sql>
-
- <!--根据条件查询评价列表-->
- <select id="getOrderEvaluateList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,di.`name` as driverName,di.phone as driverPhone,oe.* FROM t_order_evaluate as oe
- LEFT JOIN t_user as ui on ui.id = oe.userId
- LEFT JOIN t_driver as di on di.id = oe.driverId) as o
- <where>
- 1 = 1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="userName != null and userName != ''">
- and o.userName LIKE CONCAT('%',#{userName},'%')
- </if>
- <if test="userPhone != null and userPhone != ''">
- and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
- </if>
- <if test="driverName != null and driverName != ''">
- and o.driverName LIKE CONCAT('%',#{driverName},'%')
- </if>
- <if test="driverPhone != null and driverPhone != ''">
- and o.driverPhone LIKE CONCAT('%',#{driverPhone},'%')
- </if>
- <if test="fraction != null and fraction != ''">
- and o.fraction LIKE CONCAT('%',#{fraction},'%')
- </if>
- <if test="orderType != null and orderType != ''">
- and o.orderType = #{orderType}
- </if>
- <if test="roleType != null and roleType != '' and roleType == 2">
- and o.companyId = #{nowUserId} and (o.franchiseeId = 0 or o.franchiseeId is null)
- </if>
- <if test="roleType != null and roleType != '' and roleType == 3">
- and o.franchiseeId = #{nowUserId}
- </if>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TPhoneMapper.xml b/cloud-server-management/src/main/resources/mapper/TPhoneMapper.xml
deleted file mode 100644
index d187ecf..0000000
--- a/cloud-server-management/src/main/resources/mapper/TPhoneMapper.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TPhoneMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TPhone">
- <id column="id" property="id"/>
- <result column="type" property="type"/>
- <result column="platform" property="platform"/>
- <result column="phone" property="phone"/>
- <result column="companyId" property="companyId"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, type, platform, phone, companyId
- </sql>
- <insert id="addIntegral">
- insert into t_sys_integral(id,
- companyId,
- integral,
- content
- ) value (null ,#{companyId},0,#{json0})
- </insert>
- <insert id="addWait">
- insert into t_sys_driver_wait_over(id,
- companyId,
- content
- ) value (null ,#{companyId},#{json1})
- </insert>
- <insert id="addRegister">
- insert into t_sys_driver_register(id,
- companyId,
- content
- )value (null ,#{companyId},#{json2})
- </insert>
- <insert id="addUserLevel">
- insert into t_sys_driver_user_level(id,
- companyId,
- content
- )value (null ,#{companyId},#{json3})
- </insert>
- <insert id="addMotorPushOrder">
- insert into t_sys_push_order (id,
- companyId,
- pushType,
- content
- ) value (null ,#{companyId},1,#{json4})
- </insert>
- <insert id="addSendOrder">
- insert into t_sys_push_order (id,
- companyId,
- pushType,
- content
- ) value (null ,#{companyId},4,#{json5})
- </insert>
- <insert id="addCancel">
- insert into t_sys_cancle_order (id,
- companyId,
- minuteNum,
- money,
- `type`,
- orderType,
- content
- ) value (null ,#{companyId},null,null,1,1,null)
- </insert>
- <insert id="addYyCancel">
- insert into t_sys_cancle_order (id,
- companyId,
- minuteNum,
- money,
- `type`,
- orderType,
- content
- ) value (null ,#{companyId},null,null,2,1,null)
- </insert>
- <insert id="addPolice">
- insert into t_phone(id,
- `type`,
- platform,
- phone,
- companyId
- ) value (null,1,2,null ,#{companyId})
- </insert>
- <insert id="addTalk">
- insert into t_phone(id,
- `type`,
- platform,
- phone,
- companyId
- ) value (null,2,2,null ,#{companyId})
- </insert>
- <insert id="addMin">
- insert into t_sys_driver_min(id,
-companyId,
-content
-) value (null ,#{companyId},0)
- </insert>
-
-
- <update id="updateWait">
- update t_sys_driver_wait_over set content =#{json1} where companyId=#{companyId}
- </update>
- <update id="updateRegister">
- update t_sys_driver_register set content =#{json2} where companyId=#{companyId}
- </update>
- <update id="updateUserLevel">
- update t_sys_driver_user_level set content =#{json3} where companyId=#{companyId}
- </update>
- <update id="updateMotorPushOrder">
- update t_sys_push_order set content =#{json4} where companyId=#{companyId} and pushType=1
- </update>
- <update id="updateSendOrder">
- update t_sys_push_order set content =#{json5} where companyId=#{companyId} and pushType=4
- </update>
- <update id="updateCancel">
- update t_sys_cancle_order set minuteNum =#{ptCancel1} ,money=#{ptCancel2} where companyId=#{companyId} and type =1 and orderType =1
- </update>
- <update id="updateYyCancel">
- update t_sys_cancle_order set minuteNum =#{yyCancel1} ,money=#{yyCancel2} where companyId=#{companyId} and type =2 and orderType =1
- </update>
- <update id="updatePolice">
- update t_phone set phone =#{phone1} where companyId=#{companyId} and type =1
- </update>
- <update id="updateTalk">
- update t_phone set phone =#{phone2} where companyId=#{companyId} and type =2
- </update>
- <update id="updateMin">
- update t_sys_driver_min set content =#{min} where companyId = #{companyId}
- </update>
- <update id="updateIntegral">
- update t_sys_integral set content =#{json0} where companyId = #{companyId}
- </update>
- <update id="updateMinMoney">
- update t_min_money set money =#{minMoney}
- </update>
-
-
- <select id="getWaitOver" resultType="com.dsh.guns.modular.system.model.TSysSet">
- select * from t_sys_driver_wait_over where companyId = #{companyId}
- </select>
- <select id="getRegister" resultType="com.dsh.guns.modular.system.model.TSysSet">
- select * from t_sys_driver_register where companyId = #{companyId}
- </select>
- <select id="getUserLevel" resultType="com.dsh.guns.modular.system.model.TSysSet">
- select * from t_sys_driver_user_level where companyId = #{companyId}
- </select>
- <select id="getMin" resultType="com.dsh.guns.modular.system.model.TSysSet">
- select * from t_sys_driver_min where companyId = #{companyId}
- </select>
- <select id="getIntegral" resultType="com.dsh.guns.modular.system.model.TSysSet">
- select id,companyId,content from t_sys_integral where companyId = #{companyId}
- </select>
- <select id="getMinMoney" resultType="java.math.BigDecimal">
- select money from t_min_money limit 1
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TPopularizeCodeMapper.xml b/cloud-server-management/src/main/resources/mapper/TPopularizeCodeMapper.xml
deleted file mode 100644
index c92291c..0000000
--- a/cloud-server-management/src/main/resources/mapper/TPopularizeCodeMapper.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TPopularizeCodeMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TPopularizeCode">
- <id column="id" property="id" />
- <result column="code" property="code" />
- <result column="expire" property="expire" />
- </resultMap>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TProblemMapper.xml b/cloud-server-management/src/main/resources/mapper/TProblemMapper.xml
deleted file mode 100644
index 76d29c0..0000000
--- a/cloud-server-management/src/main/resources/mapper/TProblemMapper.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TProblemMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TProblem">
- <id column="id" property="id" />
- <result column="userId" property="userId" />
- <result column="content" property="content" />
- <result column="answer" property="answer" />
- <result column="handleUserId" property="handleUserId" />
- <result column="handleTime" property="handleTime" />
- <result column="insertTime" property="insertTime" />
- <result column="state" property="state" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, userId, content, answer, handleUserId, handleTime, insertTime, state
- </sql>
-
- <!--根据条件查询用户留言列表-->
- <select id="getProblemList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT su.`name` as handleUserName,pp.* FROM t_problem as pp
- LEFT JOIN sys_user as su on su.id = pp.handleUserId) as o
- <where>
- 1=1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="state != null and state != ''">
- and o.state = #{state}
- </if>
- and o.userId in
- <foreach collection="userIds" close=")" index="index" item="id" open="(" separator=",">
- #{id}
- </foreach>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TRegionMapper.xml b/cloud-server-management/src/main/resources/mapper/TRegionMapper.xml
deleted file mode 100644
index 8560318..0000000
--- a/cloud-server-management/src/main/resources/mapper/TRegionMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TRegionMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TRegion">
- <id column="id" property="id" />
- <result column="name" property="name" />
- <result column="code" property="code" />
- <result column="citycode" property="citycode" />
- <result column="parent_id" property="parentId" />
- <result column="english" property="english" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, name, code, citycode, parent_id, english
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TServerCarmodelMapper.xml b/cloud-server-management/src/main/resources/mapper/TServerCarmodelMapper.xml
deleted file mode 100644
index d8c84b6..0000000
--- a/cloud-server-management/src/main/resources/mapper/TServerCarmodelMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TServerCarmodelMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TServerCarmodel">
- <id column="id" property="id" />
- <result column="type" property="type" />
- <result column="name" property="name" />
- <result column="img" property="img" />
- <result column="state" property="state" />
- <result column="insertTime" property="insertTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, type, name, img, state, insertTime
- </sql>
-
- <!--根据条件查询服务车型列表-->
- <select id="getServerCarModelList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM t_server_carmodel as o
- <where>
- o.type = #{type} and not FIND_IN_SET(o.state,'3')
- <if test="name != null and name != ''">
- and o.name LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="state != null and state != ''">
- and o.state = #{state}
- </if>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSysCancleOrderMapper.xml b/cloud-server-management/src/main/resources/mapper/TSysCancleOrderMapper.xml
deleted file mode 100644
index 4e09bc2..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSysCancleOrderMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSysCancleOrderMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSysCancleOrder">
- <id column="id" property="id" />
- <result column="companyId" property="companyId" />
- <result column="minuteNum" property="minuteNum" />
- <result column="money" property="money" />
- <result column="type" property="type" />
- <result column="orderType" property="orderType" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, companyId, minuteNum, money, type, orderType
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSysFaceDistinguishMapper.xml b/cloud-server-management/src/main/resources/mapper/TSysFaceDistinguishMapper.xml
deleted file mode 100644
index f4dae75..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSysFaceDistinguishMapper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSysFaceDistinguishMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSysFaceDistinguish">
- <id column="id" property="id" />
- <result column="companyId" property="companyId" />
- <result column="isOpen" property="isOpen" />
- <result column="minuteNum" property="minuteNum" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, companyId, isOpen, minuteNum
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSysPushOrderMapper.xml b/cloud-server-management/src/main/resources/mapper/TSysPushOrderMapper.xml
deleted file mode 100644
index bdaf146..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSysPushOrderMapper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSysPushOrderMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSysPushOrder">
- <id column="id" property="id" />
- <result column="companyId" property="companyId" />
- <result column="pushType" property="pushType" />
- <result column="content" property="content" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, companyId, pushType ,content
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSysReformistMapper.xml b/cloud-server-management/src/main/resources/mapper/TSysReformistMapper.xml
deleted file mode 100644
index 3bf6e23..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSysReformistMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSysReformistMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSysReformist">
- <id column="id" property="id" />
- <result column="companyId" property="companyId" />
- <result column="money" property="money" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, companyId, money
- </sql>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSysSensitiveWordsMapper.xml b/cloud-server-management/src/main/resources/mapper/TSysSensitiveWordsMapper.xml
deleted file mode 100644
index a708b81..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSysSensitiveWordsMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSysSensitiveWordsMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSysSensitiveWords">
- <id column="id" property="id" />
- <result column="createTime" property="createTime" />
- <result column="content" property="content" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, createTime, content
- </sql>
-
- <!--根据条件查询敏感词列表-->
- <select id="getSensitiveWordList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM t_sys_sensitive_words as o
- <where>
- 1 = 1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.createTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="content != null and content != ''">
- and o.content LIKE CONCAT('%',#{content},'%')
- </if>
- <if test="yy != null and yy != ''">
- and o.language=#{yy}
- </if>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSystemNoticeMapper.xml b/cloud-server-management/src/main/resources/mapper/TSystemNoticeMapper.xml
deleted file mode 100644
index 6eb7a1c..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSystemNoticeMapper.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSystemNoticeMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSystemNotice">
- <id column="id" property="id" />
- <result column="type" property="type" />
- <result column="userType" property="userType" />
- <result column="noticesId" property="noticesId" />
- <result column="content" property="content" />
- <result column="userId" property="userId" />
- <result column="insertTime" property="insertTime" />
- <result column="read" property="read" />
- <result column="language" property="language" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, type, userType, noticesId, content, userId, insertTime, read
- </sql>
- <insert id="save1">
- insert into t_system_notice(id,
-type,
-noticeType,
-userType,
-noticesId,
-content,
-userId,
-insertTime,
-isRead,language
-) value (null ,#{notice.type},1,#{notice.userType},#{notice.noticesId},#{notice.content},#{notice.userId},now(),#{notice.read},#{notice.language})
- </insert>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSystemPriceMapper.xml b/cloud-server-management/src/main/resources/mapper/TSystemPriceMapper.xml
deleted file mode 100644
index c5aa013..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSystemPriceMapper.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSystemPriceMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSystemPrice">
- <id column="id" property="id" />
- <result column="type" property="type" />
- <result column="companyId" property="companyId" />
- <result column="serverCarModelId" property="serverCarModelId" />
- <result column="userType" property="userType" />
- <result column="content" property="content" />
- <result column="fareTypeNote" property="fareTypeNote"/>
- <result column="state" property="state"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, type, companyId, serverCarModelId, content
- </sql>
- <insert id="saveService">
- insert into t_system_price_check(id,
- userType,
- orderType,
- companyId,
- serverCarModelId,
- openCityId,
- type,
- content,
- insertTime,
- state,code,userId,remark
- ) value (null ,#{type},4,#{c},null,#{openCityId},#{type1},#{json2},now(),1,#{code},#{userId},#{remark})
- </insert>
- <insert id="saveMotoService">
- insert into t_system_price_check(id,
- userType,
- orderType,
- companyId,
- serverCarModelId,
- openCityId,
- type,
- content,
- insertTime,
- state,code,userId,remark
- ) value (null ,#{type},1,#{c},#{serverCarModelId},#{openCityId},#{i},#{json1},now(),1,#{code},#{userId},null)
- </insert>
- <update id="updateCheck">
- update t_system_price_check set state=#{check} where code =#{id}
- </update>
-
- <!--查询专车价格设置-->
- <select id="getSpecialPriceList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM (SELECT sp.id,sp.type,sp.companyId,
- <if test="language == 1">
- sc.`name` as name,
- </if>
- <if test="language == 2">
- sc.`ename` as name,
- </if>
- <if test="language == 3">
- sc.`yname` as name,
- </if>
- sc.img,sp.state ,sp.orderType ,tc.chineseName city ,sp.userType userType,sp.cityId,sp.openCityId from t_system_price as sp
- LEFT JOIN t_server_carmodel as sc on sc.id = sp.serverCarModelId left join t_city tc on tc.id = sp.cityId ) as o
- <where>
- o.type = 1 and o.state != 3 and o.companyId = #{companyId} and o.orderType = 1
- <if test="name != null and name != ''">
- and o.name LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="state != null and state != ''">
- and o.state = #{state}
- </if>
- </where>
- group by o.openCityId,o.`name`,o.userType
- order by o.id desc
- </select>
- <select id="getServicePriceList" resultType="java.util.Map">
- select t1.*,CONCAT(t2.areaName,t2.cityName) as chineseName ,
- t3.avatar,
- t3.account,
- t3.password,
- t3.salt,
- t3.name,
- t3.birthday,
- t3.sex,
- t3.email,
- t3.phone,
- t3.roleid,
- t3.deptid,
- t3.status,
- t3.createtime,
- t3.version,
- t3.roleType,
- t3.objectId,
- t3.passWordUpdate
- from t_system_price_check t1 left join t_open_city t2 on t1.cityId = t2.id
- left join sys_user t3 on t1.userId = t3.id
-
-
- where t1.state!=4
- <if test="sTime !=null">
- and t1.insertTime between #{sTime} and #{eTime}
- </if>
- <if test="phone!=null and phone!=''">
- and t3.phone like concat("%",#{phone},"%")
- </if>
- <if test="account!=null and account!=''">
- and t3.account like concat("%",#{account},"%")
- </if>
- <if test="state!=null and state!=''">
- and t1.state =#{state}
- </if>
- group by t1.code
- order by t1.insertTime desc
- </select>
-
- <select id="getServicePriceList1" resultType="java.util.Map">
- select t1.*,t2.chineseName chineseName ,
- t3.avatar,
- t3.account,
- t3.password,
- t3.salt,
- t3.name,
- t3.birthday,
- t3.sex,
- t3.email,
- t3.phone,
- t3.roleid,
- t3.deptid,
- t3.status,
- t3.createtime,
- t3.version,
- t3.roleType,
- t3.objectId,
- t3.passWordUpdate
-
- from t_system_price_check t1
- left join t_city t2 on t1.cityId = t2.id
- left join sys_user t3 on t1.userId = t3.id
-
-
- where t1.state!=4
- <if test="sTime !=null">
- and t1.insertTime between #{sTime} and #{eTime}
- </if>
- <if test="phone!=null and phone!=''">
- and t3.phone like concat("%",#{phone},"%")
- </if>
- <if test="account!=null and account!=''">
- and t3.account like concat("%",#{account},"%")
- </if>
- <if test="state!=null and state!=''">
- and t1.state =#{state}
- </if>
- and t1.companyId in
- <foreach collection="cid" separator="," open="(" item="id" index="index" close=")">#{id}</foreach>
- group by t1.code
- order by t1.insertTime desc
- </select>
- <select id="getService" resultType="com.dsh.guns.modular.system.model.TSystemPriceService">
- select * from t_system_price_check where code=#{tSystemPriceId}
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TSystemPriceServiceMapper.xml b/cloud-server-management/src/main/resources/mapper/TSystemPriceServiceMapper.xml
deleted file mode 100644
index 7d04d18..0000000
--- a/cloud-server-management/src/main/resources/mapper/TSystemPriceServiceMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TSystemPriceServiceMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TSystemPriceService">
- <id column="id" property="id" />
- <result column="userType" property="userType" />
- <result column="orderType" property="orderType" />
- <result column="companyId" property="companyId" />
- <result column="serverCarModelId" property="serverCarModelId" />
- <result column="cityId" property="cityId" />
- <result column="type" property="type"/>
- <result column="content" property="content"/>
- <result column="insertTime" property="insertTime"/>
- <result column="state" property="state"/>
- <result column="code" property="code"/>
- <result column="userId" property="userId"/>
- <result column="remark" property="remark"/>
- </resultMap>
-</mapper>
\ No newline at end of file
diff --git a/cloud-server-management/src/main/resources/mapper/TUserLargeCouponMapper.xml b/cloud-server-management/src/main/resources/mapper/TUserLargeCouponMapper.xml
deleted file mode 100644
index 2eeb5d4..0000000
--- a/cloud-server-management/src/main/resources/mapper/TUserLargeCouponMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TUserLargeCouponMapper">
-
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TVersionManagementMapper.xml b/cloud-server-management/src/main/resources/mapper/TVersionManagementMapper.xml
deleted file mode 100644
index e73df8a..0000000
--- a/cloud-server-management/src/main/resources/mapper/TVersionManagementMapper.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TVersionManagementMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TVersionManagement">
- <id column="id" property="id" />
- <result column="url" property="url" />
- <result column="version" property="version" />
- <result column="content" property="content" />
- <result column="mandatory" property="mandatory" />
- <result column="insertTime" property="insertTime" />
- <result column="type" property="type" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, url, version, content, mandatory, insertTime, type
- </sql>
-
- <!--根据条件查询版本列表-->
- <select id="getVersionList" resultType="map" parameterType="com.baomidou.mybatisplus.extension.plugins.pagination.Page">
- SELECT * FROM t_version_management as o
- <where>
- 1 = 1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
- </if>
- <if test="version != null and version != ''">
- and o.version LIKE CONCAT('%',#{version},'%')
- </if>
- </where>
- order by o.id desc
- </select>
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TbBannerMapper.xml b/cloud-server-management/src/main/resources/mapper/TbBannerMapper.xml
deleted file mode 100644
index 6941c37..0000000
--- a/cloud-server-management/src/main/resources/mapper/TbBannerMapper.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TbBannerMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TbBanner">
- <id column="id" property="id" />
- <result column="type" property="type" />
- <result column="usePort" property="usePort" />
- <result column="name" property="name" />
- <result column="url" property="url" />
- <result column="sort" property="sort" />
- <result column="state" property="state" />
- <result column="insertTime" property="insertTime" />
- <result column="showStartTime" property="showStartTime" />
- <result column="showStopTime" property="showStopTime" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id,
- type,
-usePort,
-name,
-url,
-sort,
-state,
-insertTime,
-showStartTime,
-showStopTime
- </sql>
-
- <select id="selectAll" resultMap="BaseResultMap">
- select id, publisher, image, type, link, sort, createTime, updateTime from tb_banner where 1=1
- <if test="s !=null and s1 !=null">
- and createTime between #{s} and #{s1}
- </if>
- </select>
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TbChatSetMapper.xml b/cloud-server-management/src/main/resources/mapper/TbChatSetMapper.xml
deleted file mode 100644
index b8530ea..0000000
--- a/cloud-server-management/src/main/resources/mapper/TbChatSetMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TbChatSetMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TbChatSet">
- <id column="id" property="id"/>
- <result column="createTime" property="createTime"/>
- <result column="type" property="type"/>
- <result column="content" property="content"/>
- <result column="state" property="state"/>
- <result column="language" property="language"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id,
- type,
-content,
-state,
-createTime
- </sql>
- <select id="getList" resultType="com.dsh.guns.modular.system.model.TbChatSet">
- select id,
- type,
- content,
- state,
- createTime from t_chat_set where 1=1
- <if test="startTime !=null and endTime !=null">
- and createTime between #{startTime} and #{endTime}
- </if>
- <if test="type!=null and type != ''">
- and type =#{type}
- </if>
- <if test="yy!=null and yy != ''">
- and language =#{yy}
- </if>
- order by createTime desc
- </select>
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TbGuidePageMapper.xml b/cloud-server-management/src/main/resources/mapper/TbGuidePageMapper.xml
deleted file mode 100644
index cbb998a..0000000
--- a/cloud-server-management/src/main/resources/mapper/TbGuidePageMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TbGuidePageMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TbGuidePage">
- <id column="id" property="id"/>
- <result column="insertTime" property="insertTime"/>
- <result column="type" property="type"/>
- <result column="name" property="name"/>
- <result column="state" property="state"/>
- <result column="url" property="url"/>
- <result column="sort" property="sort"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id,insertTime,type,name,state,url,sort
- </sql>
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TbHotAddressMapper.xml b/cloud-server-management/src/main/resources/mapper/TbHotAddressMapper.xml
deleted file mode 100644
index 245edde..0000000
--- a/cloud-server-management/src/main/resources/mapper/TbHotAddressMapper.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TbHotAddressMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TbHotAddress">
- <id column="id" property="id"/>
- <result column="cityId" property="cityId"/>
- <result column="name" property="name"/>
- <result column="address" property="address"/>
- <result column="lon" property="lon"/>
- <result column="lat" property="lat"/>
- <result column="hide" property="hide"/>
- <result column="createTime" property="createTime"/>
- <result column="sort" property="sort"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id,
- cityId,
-name,
-address,
-lon,
-lat,
-hide,
-createTime,
-sort
-
- </sql>
- <select id="getList" resultType="com.dsh.guns.modular.system.model.TbHotAddress">
- select t1.id,t1.createTime,
- <if test="language ==1 ">
- t2.chineseName as pname,
- </if>
- <if test="language ==2 ">
- t2.englishName as pname,
- </if>
- <if test="language ==3 ">
- t2.indonesianName as pname,
- </if>
-
- t1.address,t1.hide from t_hot_address t1 left join t_city t2 on t1.areaId=t2.id
- where 1=1
- <if test="sTime!=null and eTime !=null">
- and t1.createTime between #{sTime} and #{eTime}
- </if>
- <if test="name!=null and name !=''">
- and (t1.address like concat("%",#{name},"%") or t2.chineseName like concat("%",#{name},"%"))
- </if>
- </select>
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TbStartPageMapper.xml b/cloud-server-management/src/main/resources/mapper/TbStartPageMapper.xml
deleted file mode 100644
index e339f17..0000000
--- a/cloud-server-management/src/main/resources/mapper/TbStartPageMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TbStartPageMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TbStartPage">
- <id column="id" property="id"/>
- <result column="insertTime" property="insertTime"/>
- <result column="type" property="type"/>
- <result column="name" property="name"/>
- <result column="state" property="state"/>
- <result column="url" property="url"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id,insertTime,type,name,state,url
- </sql>
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TbUserExitMapper.xml b/cloud-server-management/src/main/resources/mapper/TbUserExitMapper.xml
deleted file mode 100644
index a45add5..0000000
--- a/cloud-server-management/src/main/resources/mapper/TbUserExitMapper.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TbUserExitMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TbUserExit">
- <id column="id" property="id"/>
- <result column="insertTime" property="insertTime"/>
- <result column="userId" property="userId"/>
- <result column="balance" property="balance"/>
- <result column="remark" property="remark"/>
- <result column="state" property="state"/>
- <result column="userName" property="userName"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id,
-insertTime,
-userId,
-balance,
-remark,
-state
-
-
- </sql>
- <update id="updatestate">
- update t_user_exit set state =2 where id=#{id}
- </update>
- <select id="getList" resultType="com.dsh.guns.modular.system.model.TbUserExit">
- select * from t_user_exit where 1=1
- <if test="sTime !=null and sTime !=''">
- and insertTime between #{sTime} and #{eTime}
- </if>
- <if test="state !=null and state !=''">
- and state =#{state}
- </if>
- <if test="name !=null and name !=''">
- and userName like concat("%",#{name},"%")
- </if>
- </select>
- <select id="getList1" resultType="com.dsh.guns.modular.system.model.TbUserExit">
- select * from t_user_exit where 1=1
- <if test="sTime !=null and sTime !=''">
- and insertTime between #{sTime} and #{eTime}
- </if>
- <if test="state !=null and state !=''">
- and state =#{state}
- </if>
- </select>
- <select id="getSevenDay" resultType="com.dsh.guns.modular.system.model.TbUserExit">
- select * from t_user_exit where TIMESTAMPDIFF(DAY,insertTime,now()) >=7
- </select>
-
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/TbVoiceMapper.xml b/cloud-server-management/src/main/resources/mapper/TbVoiceMapper.xml
deleted file mode 100644
index 6cb8dd9..0000000
--- a/cloud-server-management/src/main/resources/mapper/TbVoiceMapper.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dsh.course.mapper.TbVoiceMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.dsh.guns.modular.system.model.TbVoice">
- <id column="id" property="id"/>
- <result column="voiceType" property="voiceType"/>
- <result column="url" property="url"/>
- <result column="language" property="language"/>
- <result column="state" property="state"/>
- <result column="createTime" property="createTime"/>
- <result column="updateTime" property="updateTime"/>
- <result column="name" property="name"/>
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id,
-voiceType,
-url,
-language,
-state,
-createTime,
-updateTime,name
-
- </sql>
- <select id="getList" resultType="com.dsh.guns.modular.system.model.TbVoice">
- select * from t_voice where state !=3
- <if test="name !=null and name !=''">
- and url like concat("%",#{name},"%")
- </if>
- <if test="state !=null and state !=''">
- and language =#{state}
- </if>
- </select>
-
-
-
-</mapper>
diff --git a/cloud-server-management/src/main/resources/mapper/UserMapper.xml b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
index e866440..72b6a86 100644
--- a/cloud-server-management/src/main/resources/mapper/UserMapper.xml
+++ b/cloud-server-management/src/main/resources/mapper/UserMapper.xml
@@ -69,7 +69,7 @@
#{userId}
</update>
- <select id="getByAccount" resultType="user">
+ <select id="getByAccount" resultType="com.dsh.guns.modular.system.model.User">
select
<include refid="Base_Column_List_With_Pwd" />
from sys_user where account = #{account} and status != 3
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
index 0f77c5a..2276dd6 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoredValueConfigController.java
@@ -40,13 +40,16 @@
StoredValueConfig storedValueConfig = svconfigService.list().get(0);
try {
ObjectMapper objectMapper = new ObjectMapper();
- JsonNode rulesNode = objectMapper.readTree(storedValueConfig.getContent()).path("rules");
+ JsonNode rulesNode = objectMapper.readTree(storedValueConfig.getContent()).get("rules");
if (rulesNode.isArray()) {
+ int i = 0;
for (JsonNode ruleNode : rulesNode) {
+ i = i + 1;
Map<String,Object> de = new HashMap<>();
String money = ruleNode.get("money").asText();
String usersCoins = ruleNode.get("usersCoins").asText();
String MemberCoins = ruleNode.get("MemberCoins").asText();
+ de.put("chargeId",i);
de.put("money",money);
de.put("usersCoins",usersCoins);
de.put("MemberCoins",MemberCoins);
@@ -68,6 +71,7 @@
public ResultUtil<String> rechargeCenterConfig(){
try {
StoredValueConfig storedValueConfig = svconfigService.list().get(0);
+ System.out.println(svconfigService.list());
return ResultUtil.success(storedValueConfig.getDescription());
}catch (Exception e){
return ResultUtil.runErr();
--
Gitblit v1.7.1