记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 5290964e authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents ccc04695 bf7f1b3f
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 306 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/AdamThirdPartParam.java
View file @ 5290964e
......@@ -14,7 +14,7 @@ import java.io.Serializable;
@Data
public class AdamThirdPartParam implements Serializable {
private static final long serialVersionUID = 675588088506034208L;
@ApiModelProperty(position = 11, required = true, value = "第三方OPENID[64]")
@ApiModelProperty(position = 11, required = true, value = "第三方账号唯一标识[64]")
@NotBlank(message = "OPENID不能为空")
private String openId;
@ApiModelProperty(position = 12, required = true, value = "昵称[64]", example = "Swagger")
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ 5290964e
......@@ -346,7 +346,7 @@ public class AdamLoginController {
} catch (Exception e) {
log.error("WX.API调用异常[jsCode:{},respJStr={}]", jsCode, respJStr, e);
}
log.debug("jsCode={},openid={}", jsCode, openId);
log.debug("jsCode={},respJStr={}", jsCode, respJStr);
return ResponseDto.success(openId);
}
......@@ -369,10 +369,12 @@ public class AdamLoginController {
} catch (Exception e) {
log.error("WX.API调用异常[jsCode:{},respJStr={}]", code, respJStr, e);
}
log.debug("code={},openid={}", code, openId);
log.debug("code={},respJStr={}", code, respJStr);
return ResponseDto.success(openId);
}
/* ---------------------------- Internal Method ---------------------------- */
/* ---------------------------- Internal Method ---------------------------- */
/* ---------------------------- Internal Method ---------------------------- */
private ResponseDto checkSmsCode(String mobile, String code) {
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/biz/DragonPayBiz.java
View file @ 5290964e
package com.liquidnet.service.dragon.channel.strategy.biz;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
......@@ -12,21 +13,11 @@ import com.liquidnet.service.dragon.dto.PayNotifyDto;
import com.liquidnet.service.dragon.utils.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.NameValuePair;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -84,74 +75,27 @@ public class DragonPayBiz {
}
// public void sendNotifyBackup(PayNotifyReqBo payNotifyReqBo){
// PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
// LocalDateTime nowTime = LocalDateTime.now();
// MultiValueMap<String, String> params = new LinkedMultiValueMap();
// params.add("status", payNotifyDto.getStatus().toString());
// params.add("type", payNotifyDto.getType());
// params.add("code", payNotifyDto.getCode());
// params.add("paymentId", payNotifyDto.getPaymentId());
// params.add("orderCode", payNotifyDto.getOrderCode());
// params.add("price", payNotifyDto.getPrice().toString());
// params.add("paymentType", payNotifyDto.getPaymentType());
// String jsonData = JSON.toJSONString(params);
// log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
// log.info("dragon:notify:post data:{}",jsonData);
// try {
// String response = HttpUtil.post(payNotifyReqBo.getNotifyUrl(), params);
// log.debug("PAY RESPONSE=" + response);
// if (response.equals("success")) {
// this.createDragonPayNotify(payNotifyReqBo,jsonData);
// //更新通知状态-通知成功
// this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_SUCCESS.getCode()));
// } else {
// this.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_FAIL.getCode()));
// }
//
// if(true){
// throw new ConnectTimeoutException();
// }
// } catch (ConnectTimeoutException e) {
// System.out.println("请求超时");
//
// }catch (Exception e){
// e.printStackTrace();
// }
// }
public boolean sendNotify(PayNotifyReqBo payNotifyReqBo){
PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
LocalDateTime nowTime = LocalDateTime.now();
CloseableHttpClient httpclient = HttpClients.createDefault();
String jsonData = "";
try {
HttpPost httpPost = new HttpPost(payNotifyReqBo.getNotifyUrl());
//配置超时
RequestConfig requestConfig = RequestConfig.custom()
.setConnectTimeout(5000).setConnectionRequestTimeout(5000)
.setSocketTimeout(5000).build();
httpPost.setConfig(requestConfig);
//设置post请求参数
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("status", payNotifyDto.getStatus().toString()));
nvps.add(new BasicNameValuePair("type", payNotifyDto.getType()));
nvps.add(new BasicNameValuePair("code", payNotifyDto.getCode()));
nvps.add(new BasicNameValuePair("paymentId", payNotifyDto.getPaymentId()));
nvps.add(new BasicNameValuePair("orderCode", payNotifyDto.getOrderCode()));
nvps.add(new BasicNameValuePair("price", payNotifyDto.getPrice().toString()));
nvps.add(new BasicNameValuePair("paymentType", payNotifyDto.getPaymentType()));
nvps.add(new BasicNameValuePair("paymentAt", payNotifyDto.getPaymentAt()));
jsonData = JsonUtils.toJson(covertNVPS2Params(nvps));
MultiValueMap<String, String> params = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
params.add("status", payNotifyDto.getStatus().toString());
params.add("type", payNotifyDto.getType());
params.add("code", payNotifyDto.getCode());
params.add("paymentId", payNotifyDto.getPaymentId());
params.add("orderCode", payNotifyDto.getOrderCode());
params.add("price", payNotifyDto.getPrice().toString());
params.add("paymentType", payNotifyDto.getPaymentType());
params.add("paymentAt", payNotifyDto.getPaymentAt());
jsonData = JsonUtils.toJson(params);
log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
log.info("dragon:notify:post data:{}",jsonData);
httpPost.setEntity(new UrlEncodedFormEntity(nvps));
//执行post请求
CloseableHttpResponse responseObj = httpclient.execute(httpPost);
String response = EntityUtils.toString(responseObj.getEntity(), "utf-8");
String response = HttpUtil.post(payNotifyReqBo.getNotifyUrl(), params);
log.debug("PAY RESPONSE=" + response);
if (response.equalsIgnoreCase("success")) {
dragonServiceCommonBiz.createDragonPayNotify(payNotifyReqBo,jsonData);
......@@ -165,29 +109,90 @@ public class DragonPayBiz {
return false;
}
} catch (ConnectTimeoutException e) {
log.error("dragon:sendNotify 请求超时",e);
dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
//更新通知状态-通知失败
dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
return false;
} catch (Exception e) {
}
// catch (ConnectTimeoutException e) {
// log.error("dragon:sendNotify 请求超时",e);
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
// return false;
// }
catch (Exception e) {
log.error("dragon:sendNotify 请求失败",e);
dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
//更新通知状态-通知失败
dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
return false;
}finally {
//释放连接
try {
if (httpclient != null) {
httpclient.close();
}
} catch (IOException e) {
log.error("连接无法关闭",e);
}
}
}
// public boolean sendNotifyBackup(PayNotifyReqBo payNotifyReqBo){
// PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
// LocalDateTime nowTime = LocalDateTime.now();
//
// CloseableHttpClient httpclient = HttpClients.createDefault();
// String jsonData = "";
// try {
// HttpPost httpPost = new HttpPost(payNotifyReqBo.getNotifyUrl());
// //配置超时
// RequestConfig requestConfig = RequestConfig.custom()
// .setConnectTimeout(5000).setConnectionRequestTimeout(5000)
// .setSocketTimeout(5000).build();
// httpPost.setConfig(requestConfig);
//
// //设置post请求参数
// List<NameValuePair> nvps = new ArrayList<NameValuePair>();
// nvps.add(new BasicNameValuePair("status", payNotifyDto.getStatus().toString()));
// nvps.add(new BasicNameValuePair("type", payNotifyDto.getType()));
// nvps.add(new BasicNameValuePair("code", payNotifyDto.getCode()));
// nvps.add(new BasicNameValuePair("paymentId", payNotifyDto.getPaymentId()));
// nvps.add(new BasicNameValuePair("orderCode", payNotifyDto.getOrderCode()));
// nvps.add(new BasicNameValuePair("price", payNotifyDto.getPrice().toString()));
// nvps.add(new BasicNameValuePair("paymentType", payNotifyDto.getPaymentType()));
// nvps.add(new BasicNameValuePair("paymentAt", payNotifyDto.getPaymentAt()));
// jsonData = JsonUtils.toJson(covertNVPS2Params(nvps));
// log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
// log.info("dragon:notify:post data:{}",jsonData);
// httpPost.setEntity(new UrlEncodedFormEntity(nvps));
//
// //执行post请求
// CloseableHttpResponse responseObj = httpclient.execute(httpPost);
// String response = EntityUtils.toString(responseObj.getEntity(), "utf-8");
// log.debug("PAY RESPONSE=" + response);
// if (response.equalsIgnoreCase("success")) {
// dragonServiceCommonBiz.createDragonPayNotify(payNotifyReqBo,jsonData);
// //更新通知状态-通知成功
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_SUCCESS.getCode()));
// return true;
// } else {
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
// return false;
// }
//
// } catch (ConnectTimeoutException e) {
// log.error("dragon:sendNotify 请求超时",e);
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
// return false;
// } catch (Exception e) {
// log.error("dragon:sendNotify 请求失败",e);
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
// return false;
// }finally {
// //释放连接
// try {
// if (httpclient != null) {
// httpclient.close();
// }
// } catch (IOException e) {
// log.error("连接无法关闭",e);
// }
// }
// }
public String getPaymentType(String payType,String deviceFrom){
return (deviceFrom+payType).toUpperCase();
......
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/ObjectUtil.java
View file @ 5290964e
......@@ -3,8 +3,10 @@ package com.liquidnet.service.dragon.utils;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.request.AlipayTradeWapPayRequest;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import java.util.*;
import java.util.HashMap;
import java.util.LinkedList;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
......@@ -23,6 +25,7 @@ public class ObjectUtil {
private static final HashMap<String, Object> hashMapStringAndObj = new HashMap<>();
private static final AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();
private static final JSONObject jsonObjectObj = new JSONObject();
private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
public static LinkedList<Object[]> cloneLinkedListObj() {
return (LinkedList<Object[]>) linkedListObj.clone();
......@@ -47,4 +50,8 @@ public class ObjectUtil {
public static JSONObject cloneJsonObjectObj() {
return (JSONObject) jsonObjectObj.clone();
}
public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() {
return linkedMultiValueMapStringAndString.clone();
}
}
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 5290964e
......@@ -431,7 +431,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
List<KylinOrderRefundsVo> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderTicketsId);
for (KylinOrderRefundsVo item : orderRefundsVoList) {
int status = item.getStatus();
if (status != 2 && status != 4 && status != 6 && !item.getOrderRefundsId().equals(orderRefundsId)) {
log.info("status = " + status);
if (status != 2 && status != 4 && status != 5 && status != 6 && !item.getOrderRefundsId().equals(orderRefundsId)) {
refundingCount += 1;
}
}
......@@ -449,10 +450,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
KylinOrderTicketStatus orderStatusTable = KylinOrderTicketStatus.getNew();
log.info("newStatus = " + newStatus);
orderStatusTable.setStatus(newStatus);
orderStatusTable.setUpdatedAt(time);
LocalDateTime now = LocalDateTime.now();
sqlsDataA.add(new Object[]{
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderTicketsId, orderTicketVo.getChangeDate(), orderTicketVo.getChangeDate()
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderTicketsId, now, now
});
KylinOrderTicketVo kylinOrderTicketVo = KylinOrderTicketVo.getNew();
......@@ -502,7 +505,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
entitiesTable.setUpdatedAt(time);
sqlsDataB.add(new Object[]{
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), entitiesVo.getChangeDate(), entitiesVo.getChangeDate()
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), now, now
});
KylinOrderTicketEntitiesVo kylinOrderTicketEntitiesVo = KylinOrderTicketEntitiesVo.getNew();
......@@ -513,11 +516,11 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
// if(item2.getOrderTicketEntitiesId().equalsIgnoreCase(item.getOrderTicketEntitiesId())){
// log.info("entitiesVo.getRefundPrice() = "+entitiesVo.getRefundPrice());
// log.info("item2.getRefundPrice() = "+item2.getRefundPrice());
kylinOrderTicketEntitiesVo.setRefundPrice(entitiesVo.getRefundPrice());
kylinOrderTicketEntitiesVo.setRefundPrice(entitiesVo.getRefundPrice());
// }
// }
log.info("entitiesVo.getRefundPrice() = "+entitiesVo.getRefundPrice());
log.info("entitiesVo.getRefundPrice() = " + entitiesVo.getRefundPrice());
BasicDBObject entitiesObject = new BasicDBObject("$set", JSON.parse(JsonUtils.toJson(kylinOrderTicketEntitiesVo)));
mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderTicketEntitiesId").is(item.getOrderTicketEntitiesId())).getQueryObject(),
......@@ -544,6 +547,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
dataUtils.delOrderRefundVo(orderRefundsId);
dataUtils.delOrderRefundVoByOrderId(orderTicketsId);
dataUtils.delOrderTicketRedis(orderTicketsId);
orderUtils.resetOrderListVo(CurrentUtil.getCurrentUid(), 2, orderTicketsId, null);
sqls.add(SqlMapping.get("kylin_order_ticket_status.withDraw"));
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 5290964e
......@@ -101,8 +101,9 @@ public class KylinRefundsStatusServiceImpl {
LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
for (String v : ticketEntityIds) {
LocalDateTime now1 = LocalDateTime.now();
sqlsDataB.add(new Object[]{
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), v, orderInfo.getChangeDate(), orderInfo.getChangeDate()
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), v, now1, now1
});
/*kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
.eq("order_ticket_entities_id", v));*/
......@@ -176,9 +177,9 @@ public class KylinRefundsStatusServiceImpl {
sqls.add(SqlMapping.get("kylin_order_ticket_entities.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_refund.overtimeRefund"));
sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
LocalDateTime now1 = LocalDateTime.now();
sqlsDataA.add(new Object[]{
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId(), orderInfo.getChangeDate(), orderInfo.getChangeDate()
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId(), now1, now1
});
sqlsDataC.add(new Object[]{
......@@ -326,11 +327,12 @@ public class KylinRefundsStatusServiceImpl {
sqls.add(SqlMapping.get("kylin_order_refund_entities.refund"));
sqls.add(SqlMapping.get("kylin_order_refund_pic.refund"));
LocalDateTime now1 = LocalDateTime.now();
sqlsDataA.add(new Object[]{
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId(), orderInfo.getChangeDate(), orderInfo.getChangeDate()
orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId(),now1, now1
});
sqlsDataB.add(new Object[]{
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), orderEntitiesId, orderInfo.getChangeDate(), orderInfo.getChangeDate()
entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), orderEntitiesId,now1, now1
});
sqlsDataC.add(new Object[]{
kylinOrderRefunds.getOrderRefundsId(), kylinOrderRefunds.getOrderTicketsId(), kylinOrderRefunds.getOrderRefundCode(),
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java
View file @ 5290964e
......@@ -466,7 +466,7 @@ public class DataUtils {
BigDecimal orderLockPrice = new BigDecimal("0.00");
for (KylinOrderRefundsVo refundVo : kylinOrderRefundsVoBaseList) {
int status = refundVo.getStatus();
if (status == 0 || status == 3 || status == 5 || status == 7) { //退款流程未完成 金额锁定
if (status == 0 || status == 3 || status == 7) { //退款流程未完成 金额锁定
List<KylinOrderRefundEntitiesVo> refundEntitiesVos = refundVo.getOrderRefundEntitiesVoList();
for (KylinOrderRefundEntitiesVo refundEntitiesVo : refundEntitiesVos) {
if (refundEntitiesVo.getOrderTicketEntitiesId().equals(orderTicketEntitiesId)) {
......
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/biz/DragonPayBiz.java
View file @ 5290964e
package com.liquidnet.service.dragon.channel.strategy.biz;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.commons.lang.util.StringUtil;
import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
......@@ -12,21 +13,11 @@ import com.liquidnet.service.dragon.dto.PayNotifyDto;
import com.liquidnet.service.dragon.utils.ObjectUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.NameValuePair;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ConnectTimeoutException;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.MultiValueMap;
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
......@@ -84,74 +75,27 @@ public class DragonPayBiz {
}
// public void sendNotifyBackup(PayNotifyReqBo payNotifyReqBo){
// PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
// LocalDateTime nowTime = LocalDateTime.now();
// MultiValueMap<String, String> params = new LinkedMultiValueMap();
// params.add("status", payNotifyDto.getStatus().toString());
// params.add("type", payNotifyDto.getType());
// params.add("code", payNotifyDto.getCode());
// params.add("paymentId", payNotifyDto.getPaymentId());
// params.add("orderCode", payNotifyDto.getOrderCode());
// params.add("price", payNotifyDto.getPrice().toString());
// params.add("paymentType", payNotifyDto.getPaymentType());
// String jsonData = JSON.toJSONString(params);
// log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
// log.info("dragon:notify:post data:{}",jsonData);
// try {
// String response = HttpUtil.post(payNotifyReqBo.getNotifyUrl(), params);
// log.debug("PAY RESPONSE=" + response);
// if (response.equals("success")) {
// this.createDragonPayNotify(payNotifyReqBo,jsonData);
// //更新通知状态-通知成功
// this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_SUCCESS.getCode()));
// } else {
// this.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// this.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_FAIL.getCode()));
// }
//
// if(true){
// throw new ConnectTimeoutException();
// }
// } catch (ConnectTimeoutException e) {
// System.out.println("请求超时");
//
// }catch (Exception e){
// e.printStackTrace();
// }
// }
public boolean sendNotify(PayNotifyReqBo payNotifyReqBo){
PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
LocalDateTime nowTime = LocalDateTime.now();
CloseableHttpClient httpclient = HttpClients.createDefault();
String jsonData = "";
try {
HttpPost httpPost = new HttpPost(payNotifyReqBo.getNotifyUrl());
//配置超时
RequestConfig requestConfig = RequestConfig.custom()
.setConnectTimeout(5000).setConnectionRequestTimeout(5000)
.setSocketTimeout(5000).build();
httpPost.setConfig(requestConfig);
//设置post请求参数
List<NameValuePair> nvps = new ArrayList<NameValuePair>();
nvps.add(new BasicNameValuePair("status", payNotifyDto.getStatus().toString()));
nvps.add(new BasicNameValuePair("type", payNotifyDto.getType()));
nvps.add(new BasicNameValuePair("code", payNotifyDto.getCode()));
nvps.add(new BasicNameValuePair("paymentId", payNotifyDto.getPaymentId()));
nvps.add(new BasicNameValuePair("orderCode", payNotifyDto.getOrderCode()));
nvps.add(new BasicNameValuePair("price", payNotifyDto.getPrice().toString()));
nvps.add(new BasicNameValuePair("paymentType", payNotifyDto.getPaymentType()));
nvps.add(new BasicNameValuePair("paymentAt", payNotifyDto.getPaymentAt()));
jsonData = JsonUtils.toJson(covertNVPS2Params(nvps));
MultiValueMap<String, String> params = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
params.add("status", payNotifyDto.getStatus().toString());
params.add("type", payNotifyDto.getType());
params.add("code", payNotifyDto.getCode());
params.add("paymentId", payNotifyDto.getPaymentId());
params.add("orderCode", payNotifyDto.getOrderCode());
params.add("price", payNotifyDto.getPrice().toString());
params.add("paymentType", payNotifyDto.getPaymentType());
params.add("paymentAt", payNotifyDto.getPaymentAt());
jsonData = JsonUtils.toJson(params);
log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
log.info("dragon:notify:post data:{}",jsonData);
httpPost.setEntity(new UrlEncodedFormEntity(nvps));
//执行post请求
CloseableHttpResponse responseObj = httpclient.execute(httpPost);
String response = EntityUtils.toString(responseObj.getEntity(), "utf-8");
String response = HttpUtil.post(payNotifyReqBo.getNotifyUrl(), params);
log.debug("PAY RESPONSE=" + response);
if (response.equalsIgnoreCase("success")) {
dragonServiceCommonBiz.createDragonPayNotify(payNotifyReqBo,jsonData);
......@@ -165,29 +109,90 @@ public class DragonPayBiz {
return false;
}
} catch (ConnectTimeoutException e) {
log.error("dragon:sendNotify 请求超时",e);
dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
//更新通知状态-通知失败
dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
return false;
} catch (Exception e) {
}
// catch (ConnectTimeoutException e) {
// log.error("dragon:sendNotify 请求超时",e);
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
// return false;
// }
catch (Exception e) {
log.error("dragon:sendNotify 请求失败",e);
dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
//更新通知状态-通知失败
dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
return false;
}finally {
//释放连接
try {
if (httpclient != null) {
httpclient.close();
}
} catch (IOException e) {
log.error("连接无法关闭",e);
}
}
}
// public boolean sendNotifyBackup(PayNotifyReqBo payNotifyReqBo){
// PayNotifyDto payNotifyDto = payNotifyReqBo.getPayNotifyDto();
// LocalDateTime nowTime = LocalDateTime.now();
//
// CloseableHttpClient httpclient = HttpClients.createDefault();
// String jsonData = "";
// try {
// HttpPost httpPost = new HttpPost(payNotifyReqBo.getNotifyUrl());
// //配置超时
// RequestConfig requestConfig = RequestConfig.custom()
// .setConnectTimeout(5000).setConnectionRequestTimeout(5000)
// .setSocketTimeout(5000).build();
// httpPost.setConfig(requestConfig);
//
// //设置post请求参数
// List<NameValuePair> nvps = new ArrayList<NameValuePair>();
// nvps.add(new BasicNameValuePair("status", payNotifyDto.getStatus().toString()));
// nvps.add(new BasicNameValuePair("type", payNotifyDto.getType()));
// nvps.add(new BasicNameValuePair("code", payNotifyDto.getCode()));
// nvps.add(new BasicNameValuePair("paymentId", payNotifyDto.getPaymentId()));
// nvps.add(new BasicNameValuePair("orderCode", payNotifyDto.getOrderCode()));
// nvps.add(new BasicNameValuePair("price", payNotifyDto.getPrice().toString()));
// nvps.add(new BasicNameValuePair("paymentType", payNotifyDto.getPaymentType()));
// nvps.add(new BasicNameValuePair("paymentAt", payNotifyDto.getPaymentAt()));
// jsonData = JsonUtils.toJson(covertNVPS2Params(nvps));
// log.info("dragon:notify:post url:{}",payNotifyReqBo.getNotifyUrl());
// log.info("dragon:notify:post data:{}",jsonData);
// httpPost.setEntity(new UrlEncodedFormEntity(nvps));
//
// //执行post请求
// CloseableHttpResponse responseObj = httpclient.execute(httpPost);
// String response = EntityUtils.toString(responseObj.getEntity(), "utf-8");
// log.debug("PAY RESPONSE=" + response);
// if (response.equalsIgnoreCase("success")) {
// dragonServiceCommonBiz.createDragonPayNotify(payNotifyReqBo,jsonData);
// //更新通知状态-通知成功
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_SUCCESS.getCode()));
// return true;
// } else {
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
// return false;
// }
//
// } catch (ConnectTimeoutException e) {
// log.error("dragon:sendNotify 请求超时",e);
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_EXPIRE.getCode()));
// return false;
// } catch (Exception e) {
// log.error("dragon:sendNotify 请求失败",e);
// dragonServiceCommonBiz.createDragonPayNotifyFail(payNotifyReqBo,jsonData);
// //更新通知状态-通知失败
// dragonServiceCommonBiz.updateNotifyStatus(payNotifyDto.getCode(),Integer.valueOf(DragonConstant.PayNotifyStatusEnum.NOTIFY_FAIL.getCode()));
// return false;
// }finally {
// //释放连接
// try {
// if (httpclient != null) {
// httpclient.close();
// }
// } catch (IOException e) {
// log.error("连接无法关闭",e);
// }
// }
// }
public String getPaymentType(String payType,String deviceFrom){
return (deviceFrom+payType).toUpperCase();
......
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/utils/ObjectUtil.java
View file @ 5290964e
......@@ -3,8 +3,10 @@ package com.liquidnet.service.dragon.utils;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.request.AlipayTradeWapPayRequest;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap;
import java.util.*;
import java.util.HashMap;
import java.util.LinkedList;
/**
* @author AnJiabin <anjiabin@zhengzai.tv>
......@@ -23,6 +25,7 @@ public class ObjectUtil {
private static final HashMap<String, Object> hashMapStringAndObj = new HashMap<>();
private static final AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();
private static final JSONObject jsonObjectObj = new JSONObject();
private static final LinkedMultiValueMap<String, String> linkedMultiValueMapStringAndString = new LinkedMultiValueMap<String, String>();
public static LinkedList<Object[]> cloneLinkedListObj() {
return (LinkedList<Object[]>) linkedListObj.clone();
......@@ -47,4 +50,8 @@ public class ObjectUtil {
public static JSONObject cloneJsonObjectObj() {
return (JSONObject) jsonObjectObj.clone();
}
public static LinkedMultiValueMap<String, String> cloneLinkedMultiValueMapStringAndString() {
return linkedMultiValueMapStringAndString.clone();
}
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 5290964e
......@@ -100,9 +100,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
List<AdamEntersVo> entersVoList = ObjectUtil.cloneArrayListObject();
String uid = CurrentUtil.getCurrentUid();
String lock = "userId:" + uid;
if (!redisLockUtil.tryLock(lock, 1, 5)) {
return ResponseDto.failure(ErrorMapping.get("20023"));//参数错误
}
// if (!redisLockUtil.tryLock(lock, 1, 5)) {
// return ResponseDto.failure(ErrorMapping.get("20023"));//参数错误
// }
try {
currentTime = System.currentTimeMillis();
KylinPerformanceVo performanceData = dataUtils.getPerformanceVo(payOrderParam.getPerformanceId());
......@@ -674,7 +674,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(map))
);
LocalDateTime strTime = orderTicketData.getChangeDate();
LocalDateTime strTime = LocalDateTime.now();
dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
......@@ -764,7 +764,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
LinkedList<Object[]> sqlsDataC = ObjectUtil.cloneLinkedListObj();
LinkedList<Object[]> sqlsDataD = ObjectUtil.cloneLinkedListObj();
LocalDateTime strTime = orderTicketData.getChangeDate();
LocalDateTime strTime = LocalDateTime.now();
KylinOrderTickets orderTickets = KylinOrderTickets.getNew();
KylinOrderTicketStatus orderTicketStatus = KylinOrderTicketStatus.getNew();
......
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 5290964e
......@@ -106,8 +106,9 @@ public class KylinRefundsStatusServiceImpl {
objectB[0] = entitiesTable.getIsPayment();
objectB[1] = entitiesTable.getUpdatedAt();
objectB[2] = v;
objectB[3] = orderInfo.getChangeDate();
objectB[4] = orderInfo.getChangeDate();
LocalDateTime now1 = LocalDateTime.now();
objectB[3] = now1;
objectB[4] = now1;
sqlsDataB.add(objectB);
mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateOne(
......@@ -189,16 +190,17 @@ public class KylinRefundsStatusServiceImpl {
objectE[1] = paymentType;
objectE[2] = orderStatusTable.getUpdatedAt();
objectE[3] = orderInfo.getOrderTicketsId();
objectE[4] = orderInfo.getChangeDate();
objectE[5] = orderInfo.getChangeDate();
LocalDateTime now1 = LocalDateTime.now();
objectE[4] = now1;
objectE[5] = now1;
sqlsDataE.add(objectE);
Object[] objectA = ObjectUtil.cloneObjectsArray(5);
objectA[0] = orderStatusTable.getStatus();
objectA[1] = orderStatusTable.getUpdatedAt();
objectA[2] = orderInfo.getOrderTicketsId();
objectA[3] = orderInfo.getChangeDate();
objectA[4] = orderInfo.getChangeDate();
objectA[3] = now1;
objectA[4] = now1;
sqlsDataA.add(objectA);
Object[] objectC = ObjectUtil.cloneObjectsArray(13);
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java
View file @ 5290964e
......@@ -40,7 +40,7 @@ public class SweetAppletController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
})
public ResponseDto<SweetManualAppletDto> details(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<SweetManualAppletDto> details(@RequestParam() String manualId) {
return ResponseDto.success(redisDataUtils.getAppletPerformance(manualId));
}
......@@ -49,7 +49,7 @@ public class SweetAppletController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
})
public ResponseDto<List<SweetManualNotify>> notify(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<List<SweetManualNotify>> notify(@RequestParam() String manualId) {
return ResponseDto.success(redisDataUtils.getNotifyRedisData(manualId));
}
......@@ -58,7 +58,7 @@ public class SweetAppletController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
})
public ResponseDto<List<String>> tag(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<List<String>> tag(@RequestParam() String manualId) {
return ResponseDto.success(redisDataUtils.getTagRedisData(manualId));
}
......@@ -72,12 +72,12 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
})
public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "2021-12-01") String dateTime,
@RequestParam(defaultValue = "测试舞台") String stage,
@RequestParam(defaultValue = "isSign") Integer isSign,
@RequestParam(defaultValue = "page") Integer page,
@RequestParam(defaultValue = "size") Integer size) {
public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam( )String manualId,
@RequestParam() String dateTime,
@RequestParam() String stage,
@RequestParam() Integer isSign,
@RequestParam() Integer page,
@RequestParam() Integer size) {
String uid = CurrentUtil.getCurrentUid();
int startPosition = (page - 1) * size;
int endPosition = (page) * size;
......@@ -151,8 +151,8 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<SweetRichtext> richText(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") String type) {
public ResponseDto<SweetRichtext> richText(@RequestParam() String manualId,
@RequestParam() String type) {
return ResponseDto.success(redisDataUtils.getRichTextRedisData(manualId, type));
}
......@@ -162,8 +162,8 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
})
public ResponseDto<Boolean> watch(@RequestParam(defaultValue = "1") String uid,
@RequestParam(defaultValue = "1") String artistsId) {
public ResponseDto<Boolean> watch(@RequestParam() String uid,
@RequestParam() String artistsId) {
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "sign");
return ResponseDto.success();
}
......@@ -174,8 +174,8 @@ public class SweetAppletController {
@ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
})
public ResponseDto<Boolean> sign(@RequestParam(defaultValue = "1") String uid,
@RequestParam(defaultValue = "1") String artistsId) {
public ResponseDto<Boolean> sign(@RequestParam() String uid,
@RequestParam() String artistsId) {
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "watch");
return ResponseDto.success();
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetArtistsController.java
View file @ 5290964e
......@@ -37,9 +37,9 @@ public class SweetArtistsController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "艺人姓名 不查询从传递null", required = false),
})
public ResponseDto<PageInfo<SweetArtists>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "艺人姓名",required = false) String name) {
public ResponseDto<PageInfo<SweetArtists>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam(required = false) String name) {
return sweetArtistsService.getList(page, size, name);
}
......@@ -51,10 +51,10 @@ public class SweetArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "艺人简介", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "") String picUrl,
@RequestParam(defaultValue = "艺人姓名") String name,
@RequestParam(defaultValue = "pinyin") String pinyin,
@RequestParam(defaultValue = "艺人简介") String describe) {
public ResponseDto<Boolean> add(@RequestParam() String picUrl,
@RequestParam() String name,
@RequestParam() String pinyin,
@RequestParam() String describe) {
return sweetArtistsService.add(picUrl, name, pinyin, describe);
}
......@@ -63,7 +63,7 @@ public class SweetArtistsController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人Id", required = true),
})
public ResponseDto<SweetArtists> detail(@RequestParam(defaultValue = "1") String artistsId) {
public ResponseDto<SweetArtists> detail(@RequestParam() String artistsId) {
return sweetArtistsService.detail(artistsId);
}
......@@ -76,11 +76,11 @@ public class SweetArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "pinyin", value = "姓名拼音", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "describe", value = "艺人简介", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String artistsId,
@RequestParam(defaultValue = "") String picUrl,
@RequestParam(defaultValue = "艺人姓名") String name,
@RequestParam(defaultValue = "pinyin") String pinyin,
@RequestParam(defaultValue = "艺人简介") String describe) {
public ResponseDto<Boolean> change(@RequestParam() String artistsId,
@RequestParam() String picUrl,
@RequestParam() String name,
@RequestParam() String pinyin,
@RequestParam() String describe) {
return sweetArtistsService.change(artistsId, picUrl, name, pinyin, describe);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualArtistsController.java
View file @ 5290964e
......@@ -37,9 +37,9 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "manaulId", value = "手册id", required = true),
})
public ResponseDto<PageInfo<SweetManualArtistListDto>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "") String manualId) {
public ResponseDto<PageInfo<SweetManualArtistListDto>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam() String manualId) {
return sweetManualArtistsService.getList(page, size, manualId);
}
......@@ -48,7 +48,7 @@ public class SweetManualArtistsController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualRelationId", value = "手册艺人id", required = true),
})
public ResponseDto<SweetManualArtistListDto> details(@RequestParam(defaultValue = "") String manualRelationId) {
public ResponseDto<SweetManualArtistListDto> details(@RequestParam() String manualRelationId) {
return sweetManualArtistsService.details(manualRelationId);
}
......@@ -63,13 +63,13 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureStart", value = "签售开始时间", required = false),
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureEnd", value = "签售结束时间", required = false),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "10") String artistId,
@RequestParam(defaultValue = "") String stageId,
@RequestParam(defaultValue = "", required = false) String performanceStart,
@RequestParam(defaultValue = "", required = false) String performanceEnd,
@RequestParam(defaultValue = "", required = false) String signatureStart,
@RequestParam(defaultValue = "", required = false) String signatureEnd) {
public ResponseDto<Boolean> add(@RequestParam() String manualId,
@RequestParam() String artistId,
@RequestParam() String stageId,
@RequestParam( required = false) String performanceStart,
@RequestParam( required = false) String performanceEnd,
@RequestParam( required = false) String signatureStart,
@RequestParam( required = false) String signatureEnd) {
return sweetManualArtistsService.add(manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
}
......@@ -85,14 +85,14 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureStart", value = "签售开始时间", required = false),
@ApiImplicitParam(type = "query", dataType = "String", name = "signatureEnd", value = "签售结束时间", required = false),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String manualRelationId,
@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "10") String artistId,
@RequestParam(defaultValue = "") String stageId,
@RequestParam(defaultValue = "", required = false) String performanceStart,
@RequestParam(defaultValue = "", required = false) String performanceEnd,
@RequestParam(defaultValue = "", required = false) String signatureStart,
@RequestParam(defaultValue = "", required = false) String signatureEnd) {
public ResponseDto<Boolean> change(@RequestParam() String manualRelationId,
@RequestParam() String manualId,
@RequestParam() String artistId,
@RequestParam() String stageId,
@RequestParam( required = false) String performanceStart,
@RequestParam( required = false) String performanceEnd,
@RequestParam( required = false) String signatureStart,
@RequestParam(required = false) String signatureEnd) {
return sweetManualArtistsService.change(manualRelationId, manualId, artistId, stageId, performanceStart, performanceEnd, signatureStart, signatureEnd);
}
......@@ -102,8 +102,8 @@ public class SweetManualArtistsController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualRelationId", value = "手册艺人id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true)
})
public ResponseDto<Boolean> delete(@RequestParam(defaultValue = "1") String manualRelationId,
@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<Boolean> delete(@RequestParam() String manualRelationId,
@RequestParam() String manualId) {
return sweetManualArtistsService.delete(manualRelationId, manualId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualController.java
View file @ 5290964e
......@@ -37,9 +37,9 @@ public class SweetManualController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "姓名", required = false),
})
public ResponseDto<PageInfo<SweetManualDto>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "",required = false) String name) {
public ResponseDto<PageInfo<SweetManualDto>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam(required = false) String name) {
return sweetManualService.getManualList(page, size, name);
}
......@@ -49,8 +49,8 @@ public class SweetManualController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
})
public ResponseDto<Boolean> changeRelease(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") Integer isRelease) {
public ResponseDto<Boolean> changeRelease(@RequestParam() String manualId,
@RequestParam() Integer isRelease) {
return sweetManualService.changeRelease(manualId, isRelease);
}
......@@ -61,9 +61,9 @@ public class SweetManualController {
@ApiImplicitParam(type = "query", dataType = "String", name = "performancesId", value = "演出id", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "status", value = "开启状态", required = true),
})
public ResponseDto<Boolean> changeStatus(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") String performancesId,
@RequestParam(defaultValue = "1") Integer status) {
public ResponseDto<Boolean> changeStatus(@RequestParam() String manualId,
@RequestParam() String performancesId,
@RequestParam() Integer status) {
return sweetManualService.changeStatus(manualId, performancesId, status);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualNotifyController.java
View file @ 5290964e
......@@ -39,10 +39,10 @@ public class SweetManualNotifyController {
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "通知标题 不查询从传递null", required = false),
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
})
public ResponseDto<PageInfo<SweetManualNotify>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "标题", required = false) String name,
@RequestParam(defaultValue = "手册id") String manualId) {
public ResponseDto<PageInfo<SweetManualNotify>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam( required = false) String name,
@RequestParam() String manualId) {
return sweetManualNotifyService.getList(page, size, name, manualId);
}
......@@ -53,9 +53,9 @@ public class SweetManualNotifyController {
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "content", value = "内容", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "") String manualId,
@RequestParam(defaultValue = "标题") String title,
@RequestParam(defaultValue = "内容") String content) {
public ResponseDto<Boolean> add(@RequestParam() String manualId,
@RequestParam() String title,
@RequestParam() String content) {
return sweetManualNotifyService.add(manualId, title, content);
}
......@@ -64,7 +64,7 @@ public class SweetManualNotifyController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
})
public ResponseDto<SweetManualNotify> detail(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<SweetManualNotify> detail(@RequestParam() String manualId) {
return sweetManualNotifyService.details(manualId);
}
......@@ -76,10 +76,10 @@ public class SweetManualNotifyController {
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "content", value = "内容", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "") String manualId,
@RequestParam(defaultValue = "") String manualNotifyId,
@RequestParam(defaultValue = "标题") String title,
@RequestParam(defaultValue = "内容") String content) {
public ResponseDto<Boolean> change(@RequestParam() String manualId,
@RequestParam() String manualNotifyId,
@RequestParam() String title,
@RequestParam() String content) {
return sweetManualNotifyService.change(manualId, manualNotifyId, title, content);
}
......@@ -88,7 +88,7 @@ public class SweetManualNotifyController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualNotifyId", value = "手册通知id", required = true),
})
public ResponseDto<Boolean> delete(@RequestParam(defaultValue = "1") String manualNotifyId) {
public ResponseDto<Boolean> delete(@RequestParam() String manualNotifyId) {
return sweetManualNotifyService.delete(manualNotifyId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualSortController.java
View file @ 5290964e
......@@ -34,8 +34,8 @@ public class SweetManualSortController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "content", value = "内容 例子(POSITION_1,POSITION_2)", required = true)
})
public ResponseDto<Boolean> changeStatus(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "") String content) {
public ResponseDto<Boolean> changeStatus(@RequestParam() String manualId,
@RequestParam() String content) {
return sweetManualSortService.add(manualId, content);
}
......@@ -44,7 +44,7 @@ public class SweetManualSortController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true)
})
public ResponseDto<SweetManualSort> changeStatus(@RequestParam(defaultValue = "1") String manualId) {
public ResponseDto<SweetManualSort> changeStatus(@RequestParam() String manualId) {
return sweetManualSortService.get(manualId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetRichtextController.java
View file @ 5290964e
......@@ -36,8 +36,8 @@ public class SweetRichtextController {
@ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "电子手册id", required = true),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<SweetRichtext> get(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "1") Integer type) {
public ResponseDto<SweetRichtext> get(@RequestParam() String manualId,
@RequestParam() Integer type) {
return sweetRichtextService.get(manualId, type);
}
......@@ -50,11 +50,11 @@ public class SweetRichtextController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "picUrl", value = "图片地址", required = false),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "",required = false) String details,
@RequestParam(defaultValue = "100.100,200.200",required = false) String local,
@RequestParam(defaultValue = "",required = false) String picUrl,
@RequestParam(defaultValue = "1") Integer type) {
public ResponseDto<Boolean> add(@RequestParam() String manualId,
@RequestParam(required = false) String details,
@RequestParam(required = false) String local,
@RequestParam(required = false) String picUrl,
@RequestParam() Integer type) {
return sweetRichtextService.add(manualId, details, local, picUrl, type);
}
......@@ -67,11 +67,11 @@ public class SweetRichtextController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "picUrl", value = "图片地址", required = false),
@ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "类型 (1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略)", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String manualId,
@RequestParam(defaultValue = "",required = false) String details,
@RequestParam(defaultValue = "100.100,200.200",required = false) String local,
@RequestParam(defaultValue = "",required = false) String picUrl,
@RequestParam(defaultValue = "1") Integer type) {
public ResponseDto<Boolean> change(@RequestParam() String manualId,
@RequestParam(required = false) String details,
@RequestParam(required = false) String local,
@RequestParam(required = false) String picUrl,
@RequestParam() Integer type) {
return sweetRichtextService.change(manualId, details, local, picUrl, type);
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetStageController.java
View file @ 5290964e
......@@ -35,19 +35,19 @@ public class SweetStageController {
@ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "舞台名称", required = false),
})
public ResponseDto<PageInfo<SweetStage>> getList(@RequestParam(defaultValue = "1") Integer page,
@RequestParam(defaultValue = "10") Integer size,
@RequestParam(defaultValue = "名字",required = false) String title) {
public ResponseDto<PageInfo<SweetStage>> getList(@RequestParam() Integer page,
@RequestParam() Integer size,
@RequestParam(required = false) String title) {
return sweetStageService.getList(page, size, title);
}
@PostMapping("add")
@ApiOperation("添加舞台")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "舞台名", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "舞台名", required = true),
})
public ResponseDto<Boolean> add(@RequestParam(defaultValue = "舞台名") String name) {
return sweetStageService.add(name);
public ResponseDto<Boolean> add(@RequestParam() String title) {
return sweetStageService.add(title);
}
@GetMapping("detail")
......@@ -55,7 +55,7 @@ public class SweetStageController {
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "stageId", value = "舞台Id", required = true),
})
public ResponseDto<SweetStage> detail(@RequestParam(defaultValue = "1") String stageId) {
public ResponseDto<SweetStage> detail(@RequestParam() String stageId) {
return sweetStageService.detail(stageId);
}
......@@ -63,10 +63,10 @@ public class SweetStageController {
@ApiOperation("修改舞台")
@ApiImplicitParams({
@ApiImplicitParam(type = "query", dataType = "String", name = "stageId", value = "舞台Id", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "name", value = "舞台名", required = true),
@ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "舞台名", required = true),
})
public ResponseDto<Boolean> change(@RequestParam(defaultValue = "1") String stageId,
@RequestParam(defaultValue = "舞台名") String name) {
return sweetStageService.change(name, stageId);
public ResponseDto<Boolean> change(@RequestParam() String stageId,
@RequestParam() String title) {
return sweetStageService.change(title, stageId);
}
}
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualDto.java
View file @ 5290964e
......@@ -7,6 +7,7 @@ import java.io.Serializable;
@Data
public class SweetManualDto implements Serializable ,Cloneable{
private String manualId;
private String performancesId;
private String title;
private String timeStart;
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetArtistsServiceImpl.java
View file @ 5290964e
......@@ -45,8 +45,13 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
public ResponseDto<PageInfo<SweetArtists>> getList(int page, int size, String name) {
PageInfo<SweetArtists> pageInfo = null;
try {
List<SweetArtists> data;
PageHelper.startPage(page, size);
List<SweetArtists> data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name));
if(name!=null){
data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class).like(SweetArtists::getName, name));
}else{
data = sweetArtistsMapper.selectList(Wrappers.lambdaQuery(SweetArtists.class));
}
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualNotifyServiceImpl.java
View file @ 5290964e
......@@ -38,7 +38,12 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
PageInfo<SweetManualNotify> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<SweetManualNotify> data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).like(SweetManualNotify::getTitle, title).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
List<SweetManualNotify> data;
if (title != null) {
data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).like(SweetManualNotify::getTitle, title).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
} else {
data = sweetManualNotifyMapper.selectList(Wrappers.lambdaQuery(SweetManualNotify.class).eq(SweetManualNotify::getManualId, manualId).eq(SweetManualNotify::getStatus, 1));
}
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......@@ -77,7 +82,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
}
@Override
public ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content) {
public ResponseDto<Boolean> change(String manualId, String manualNotifyId, String title, String content) {
try {
SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
sweetManualNotify.setTitle(title);
......@@ -86,12 +91,12 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
sweetManualNotifyMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId));
List<SweetManualNotify> oldData = redisDataUtils.getNotifyRedisData(manualId);
for (SweetManualNotify item:oldData){
if(item.getManualNotifyId().equalsIgnoreCase(manualNotifyId)){
item.setTitle(title);
item.setContent(content);
item.setUpdatedAt(LocalDateTime.now());
}
for (SweetManualNotify item : oldData) {
if (item.getManualNotifyId().equalsIgnoreCase(manualNotifyId)) {
item.setTitle(title);
item.setContent(content);
item.setUpdatedAt(LocalDateTime.now());
}
}
redisDataUtils.setNotifyRedisData(manualId, oldData);
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualServiceImpl.java
View file @ 5290964e
......@@ -47,7 +47,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
PageHelper.startPage(page, size);
HashMap<String, Object> map = CollectionUtil.mapStringObject();
map.put("title", name);
List<SweetManualDto> voList = sweetManualMapper.getManualList(BeanUtil.convertBeanToMap(map));
List<SweetManualDto> voList = sweetManualMapper.getManualList(map);
for (int i = 0; i < voList.size(); i++) {
SweetManualDto vo = voList.get(i);
if (vo.getStatus() >= 6 && vo.getStatus() != 7) {
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStageServiceImpl.java
View file @ 5290964e
......@@ -43,7 +43,12 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
PageInfo<SweetStage> pageInfo = null;
try {
PageHelper.startPage(page, size);
List<SweetStage> data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class).like(SweetStage::getTitle, title));
List<SweetStage> data;
if(title!=null) {
data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class).like(SweetStage::getTitle, title));
}else{
data = sweetStageMapper.selectList(Wrappers.lambdaQuery(SweetStage.class));
}
pageInfo = new PageInfo(data);
return ResponseDto.success(pageInfo);
} catch (Exception e) {
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualMapper.xml
View file @ 5290964e
......@@ -3,6 +3,7 @@
<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualMapper">
<resultMap id="partnerPerformanceListResult" type="com.liquidnet.service.sweet.dto.SweetManualDto">
<result column="manual_id" property="manualId"/>
<result column="performances_id" property="performancesId"/>
<result column="title" property="title"/>
<result column="time_start" property="timeStart"/>
......@@ -27,6 +28,7 @@
<!-- 电子手册列表 -->
<select id="getManualList" parameterType="java.util.Map" resultMap="partnerPerformanceListResult">
SELECT
IFNULL(sm.manual_id,0) as 'manual_id',
p.performances_id ,
p.title ,
p.time_start ,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment