diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index 2e60501..093b437 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -109,13 +109,13 @@
update coupon_info a inner join (
- select a.id
- from coupon_info a, coupon_template b, coupon_type c
- where a.coupon_template_id = b.id and b.type_id = c.id and a.status=1 and c.type in
-
- #{type}
-
- and a.user_id = #{personId}
+ select a.id
+ from coupon_info a, coupon_template b, coupon_type c
+ where a.coupon_template_id = b.id and b.type_id = c.id and a.status=1 and c.type in
+
+ #{type}
+
+ and a.user_id = #{personId}
) b on a.id = b.id set a.status = 3
@@ -135,52 +135,52 @@
-
\ No newline at end of file
diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java
index 17b3234..d17c8fe 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java
@@ -1,6 +1,7 @@
package com.lyms.platform.common.result;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
import java.util.HashMap;
import java.util.Map;
@@ -15,21 +16,19 @@ public class RespBuilder {
return buildSuccess(null);
}
- public static BaseObjectResponse buildSuccess(Object data) {
+ public static BaseObjectResponse buildSuccess(Object ... data) {
BaseObjectResponse resp = new BaseObjectResponse();
- resp.setData(data);
- return resp;
- /* BaseObjectResponse resp = new BaseObjectResponse();
+
if(data != null) {
Assert.isTrue(data.length == 1 || data.length % 2 == 0, "length必须为偶数");
if(data.length == 1) {
- resp.setData(data);
+ resp.setData(data[0]);
} else {
resp.setData(createMap(data));
}
}
- return resp;*/
+ return resp;
}
public static BaseObjectResponse buildErro(ResponseCode code) {
@@ -60,4 +59,5 @@ public class RespBuilder {
}
return map;
}
+
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
index c9f0a69..0dd2e1b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
@@ -209,7 +209,7 @@ public class ReportController extends BaseController {
public BaseObjectResponse coupon(HttpServletRequest request, Date startDate, Date endDate,
String provinceId, String cityId, String areaId, String hospitalId, String tempId, String couponType) {
Map param = CollectionUtils.createMap("userId", getUserId(request), "startDate", startDate,
- "endDate", endDate, "hospitalIds", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId",
+ "endDate", endDate, "hospitalId", hospitalId, "provinceId", provinceId, "cityId", cityId, "areaId",
areaId, "tempId", tempId, "couponType", couponType);
return reportService.couponInfo(param);
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index df36dca..1315085 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -407,25 +407,26 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
@Override
public BaseObjectResponse couponInfo(Map param) {
- List hospitalIds = Arrays.asList("216", "245"); /** 模拟根据登陆人id 查询出来的医院 */
-
- param.put("hospitalIds", CollectionUtils.asList((String) param.get("hospitalIds")));
+ if(StringUtils.isBlank((String) param.get("hospitalId"))) {
+ param.put("hospitalId", Arrays.asList("216", "245")); /** 模拟根据登陆人id 查询出来的医院 */
+ } else {
+ param.put("hospitalId", CollectionUtils.asList((String) param.get("hospitalId")));
+ }
param.put("status", 2);
- param.put("couponTypes", CollectionUtils.asList((String) param.get("couponTypes")));
+ param.put("couponType", CollectionUtils.asList((String) param.get("couponType")));
List