Skip to content

G
gdtel-gztel-school-center
Commit 3e99e4ed by 罗承锋
Options

修改细节问题

parent 364299f5
Showing with 54 additions and 27 deletions
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -122,6 +122,31 @@ public class RongHeController {
}
/**
* 获取支付状态
* @param orderSeq
* @return
*/
@PostMapping("/payStatus")
public ResponseData<String> getPayStatus(@RequestParam("orderSeq") String orderSeq) {
Wrapper<OrderView> wrapper = new EntityWrapper<>();
wrapper.eq("orderSeq", orderSeq);
List<OrderView> orderViews = orderViewMapper.selectList(wrapper);
if (orderViews == null || orderViews.size() == 0) {
return ResponseData.error("未找到当前订单");
}
if (orderViews.size() == 2) {
return ResponseData.error("重复订单");
}
if(StringUtils.isNotBlank(orderViews.get(0).getUptranseq())) {
return ResponseData.success("支付成功");
}
return ResponseData.error("");
}
/**
* 支付平台异步更新后台地址，主要对订单进去保存和提交订单到智能平台上
*
* @return
......@@ -273,7 +298,9 @@ public class RongHeController {
SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
Date parse = null;
try {
parse = simpleDateFormat1.parse(rhTime);
if (StringUtils.isNotBlank(rhTime)) {
parse = simpleDateFormat1.parse(rhTime);
}
} catch (ParseException e) {
e.printStackTrace();
}
......@@ -435,16 +462,17 @@ public class RongHeController {
map.put("ORDERNUMBER", orderView.getOrderNumber());//身份证
if (Constant.Payment1.equals(ipay)) {
// if (Constant.Payment1.equals(ipay)) {
//支付成功回调的页面
/* String MERCHANTURL = Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
/* String MERCHANTURL = "http://167460x6b0.51mypc.cn/ciop/rongHe/toSubmisOrderPreser?id=" + userId +"orderId="+id;*/
String MERCHANTURL = "http://3715zj2369.qicp.vip/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
String MERCHANTURL = "http://chengfengluo.ngrok2.xiaomiqiu.cn/#/hhr/dkSuccessful?id="+userId+"&"+"orderId="+id;
map.put("MERCHANTURL", MERCHANTURL);
}
// }
// 融合回调后端接口地址
// map.put("BACKDROPURL", Constant.TOMCATURL + "/rongHe/toSubmisOrderPreser");
map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
// map.put("BACKDROPURL", "http://3715zj2369.qicp.vip/ciop/rongHe/toSubmisOrderPreser");
map.put("BACKDROPURL", "http://chengfengluo.ngrok2.xiaomiqiu.cn/ciop/rongHe/toSubmisOrderPreser");
String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.APPK;//商户标识
//* 将值转换为大写 *//*
......
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
......@@ -377,6 +377,8 @@ public class codeManagerController {
}
}
}catch (Exception e){
e.printStackTrace();
log.error(e.getMessage());
return ResponseData.error("连接超时，请重试");
}
return ResponseData.success();
......
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
......@@ -260,7 +260,7 @@ public class IntelligenceSendOrder {
private JSONObject getQueryOrderInfo(
String orderNum, String currentTimeStr, int count) throws Exception {
List<NameValuePair> qParams = new ArrayList<NameValuePair>();
HttpHost proxy = new HttpHost("172.18.101.170", 3128);
// HttpHost proxy = new HttpHost("172.18.101.170", 3128);
RequestConfig defaultRequestConfig =
RequestConfig.custom()
.setSocketTimeout(50000)
......
common/src/main/java/com/winsun/utils/AccessStatisticDataSearchUtils.java
......@@ -14,7 +14,8 @@ import java.io.IOException;
@Slf4j
public class AccessStatisticDataSearchUtils {
public final static String ES_URL = "http://172.18.101.171:9200/";
// public final static String ES_URL = "http://172.18.101.171:9200/";
public final static String ES_URL = "http://localhost:9200/";
public final static String SEARCH = "/_search";
......
core-service/src/main/resources/application-prod.yml
......@@ -143,4 +143,7 @@ messageconfig:
channel:
phoneRule:
enabled:
rule:
\ No newline at end of file
rule:
weixin:
appid: wx0641dc1dc4d34384
appsecret: 3b43b46fc94d4e98588ee6ad992fa5c7
\ No newline at end of file
migration/src/main/java/com/winsun/migration/service/impl/MigrationServiceImpl.java
......@@ -73,20 +73,6 @@ public class MigrationServiceImpl implements IMigrationService {
private SchoolPackageMapper schoolPackageMapper;
/**
* 带图片迁移学校数据
*/
public void migrationSchool() {
}
/**
* 迁移产品数据（图片）
*/
public void migrationProduct() {
}
/**
* 移动卡和学校关联表(只有新增)
*/
public void migrationSchoolPackage() {
......@@ -196,6 +182,8 @@ public class MigrationServiceImpl implements IMigrationService {
insertResult(oldUserList.size(), "hhr_user", hhrError);
this.insertYRYMUser();
this.migrationSchoolPackage();
}
/**
......
service-manager/src/main/java/com/winsun/controller/StudentCardVerifyController.java
......@@ -124,11 +124,10 @@ public class StudentCardVerifyController extends BaseController {
*/
@RequestMapping(value = "uploadCard", method = RequestMethod.POST)
@ResponseBody
public ResponseData<String> uploadStuCard(String id,String userName, String orderPhone, String linkPhone,
public ResponseData<String> uploadStuCard(String userName, String orderPhone, String linkPhone,
String idCard,String file1,String file2,String file3,String file4) {
Wrapper<StudentCard> wrapper = new EntityWrapper<>();
wrapper.eq("id", id);
wrapper.eq("order_phone", orderPhone);
wrapper.eq("id_card", idCard);
StudentCard student = new StudentCard();
......@@ -136,6 +135,7 @@ public class StudentCardVerifyController extends BaseController {
student.setOrderPhone(orderPhone);
student.setLinkPhone(linkPhone);
student.setIdCard(idCard);
student.setUploadDate(new Date());
if(StringUtils.isNotBlank(file1)){
String file01 = PicturesUtil.uploadPictures(file1, "",PATH1);
student.setStudentCardUrl(file01);
......@@ -154,9 +154,13 @@ public class StudentCardVerifyController extends BaseController {
}
Integer integer1 = studentCardMapper.update(student,wrapper);
if(integer1==1){
return ResponseData.success("更新成功！");
}else{
student.setIsFirstUpload(1);
student.setFirstUploadDate(new Date());
studentCardMapper.insert(student);
return ResponseData.success("上传成功！");
}
return ResponseData.error("上传失败！");
}
/**
......@@ -241,7 +245,8 @@ public class StudentCardVerifyController extends BaseController {
studentCardWrapper.eq(StringUtils.isNotBlank(orderPhone),"order_phone",orderPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(linkPhone),"link_phone",linkPhone);
studentCardWrapper.eq(StringUtils.isNotBlank(auditState),"audit_state",auditState);
studentCardWrapper.orderBy("audit_date",false);
// studentCardWrapper.orderBy("audit_date",false);
studentCardWrapper.orderBy("upload_date", false);
if(StringUtils.isNotBlank(uploadDate)){
String[] dates = uploadDate.split("\\,");
if(!uploadDate.equals(",")){
......
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