提交代码

dev-discount
胡锐 3 years ago
commit 33cd4da77e
  1. 1
      hai-bweb/src/main/java/com/bweb/config/AuthConfig.java
  2. 2
      hai-bweb/src/main/java/com/bweb/controller/HighTestController.java
  3. 6
      hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java
  4. 5
      hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
  5. 177
      hai-cweb/src/main/java/com/cweb/controller/testController.java
  6. 4
      hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
  7. 1
      hai-service/src/main/java/com/hai/enum_type/OrderPushType.java
  8. 2
      hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
  9. 2
      hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java
  10. 2
      hai-service/src/main/java/com/hai/service/pay/impl/GoodsOrderServiceImpl.java
  11. 8
      hai-service/src/main/resources/dev/commonConfig.properties

@ -96,7 +96,6 @@ public class AuthConfig implements WebMvcConfigurer {
.excludePathPatterns("/coupon/getGuizhouSinopec") .excludePathPatterns("/coupon/getGuizhouSinopec")
.excludePathPatterns("/cmsContent/get*") .excludePathPatterns("/cmsContent/get*")
.excludePathPatterns("/highGoldRec/*") .excludePathPatterns("/highGoldRec/*")
.excludePathPatterns("/test/*")
.excludePathPatterns("/openApi/*") .excludePathPatterns("/openApi/*")
; ;
} }

File diff suppressed because one or more lines are too long

@ -369,7 +369,11 @@ public class OutRechargeOrderController {
// 积分退款 // 积分退款
if (order.getPayType() == 3) { if (order.getPayType() == 3) {
highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId()); if (highUserService.findGoldRepeat(3 , order.getId())) {
highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId());
}else {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录");
}
order.setStatus(5); order.setStatus(5);
order.setRefundTime(new Date()); order.setRefundTime(new Date());
order.setOutRefundNo("HFR"+new Date().getTime() ); order.setOutRefundNo("HFR"+new Date().getTime() );

@ -86,6 +86,8 @@ public class CzOrderController {
highGasOrderRefund.setCreateTime(new Date()); highGasOrderRefund.setCreateTime(new Date());
highGasOrderRefund.setReturnContent(String.valueOf(dataObject)); highGasOrderRefund.setReturnContent(String.valueOf(dataObject));
highGasOrderRefundMapper.insert(highGasOrderRefund);
if (dataObject.getInteger("status") == 3) { if (dataObject.getInteger("status") == 3) {
OutRechargeOrder order; OutRechargeOrder order;
OutRechargeOrderRecord rechargeOrderRecord = rechargeOrderRecordService.findByOrderNo(dataObject.getString("out_order_id")); OutRechargeOrderRecord rechargeOrderRecord = rechargeOrderRecordService.findByOrderNo(dataObject.getString("out_order_id"));
@ -188,6 +190,7 @@ public class CzOrderController {
String resultXmL = doRefundRequest(param.get("mch_id"), WxUtils.mapToXml(param)); String resultXmL = doRefundRequest(param.get("mch_id"), WxUtils.mapToXml(param));
OrderRefundModel orderRefundModel = XmlUtil.getObjectFromXML(resultXmL, OrderRefundModel.class); OrderRefundModel orderRefundModel = XmlUtil.getObjectFromXML(resultXmL, OrderRefundModel.class);
if(orderRefundModel.getResult_code().equals("SUCCESS")) { if(orderRefundModel.getResult_code().equals("SUCCESS")) {
order.setStatus(5); order.setStatus(5);
order.setRefundTime(new Date()); order.setRefundTime(new Date());
@ -229,7 +232,7 @@ public class CzOrderController {
// 积分退款 // 积分退款
if (order.getPayType() == 3) { if (order.getPayType() == 3) {
if (!highUserService.findGoldRepeat(3 , order.getId())) { if (highUserService.findGoldRepeat(3 , order.getId())) {
highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId()); highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId());
}else { }else {
log.error("orderToPay error!", "已有退款记录"); log.error("orderToPay error!", "已有退款记录");

@ -1,177 +0,0 @@
package com.cweb.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.hai.model.MtSmsMessageModel;
import com.hai.model.ResponseData;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.URL;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
@Controller
@Api(value = "华为云短信发送")
@RequestMapping(value = "/test1")
public class testController {
/**
* 设置不验证主机
*/
private static final HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() {
@Override
public boolean verify(String hostname, SSLSession session) {
return true;
}
};
@RequestMapping(value = "/sendSmsCode", method = RequestMethod.GET)
@ApiOperation(value = "发送短信验证码")
@ResponseBody
public String sendSmsCode(@RequestParam(value = "phone", required = true) String phone) throws Exception {
// ip:port根据实际情况填写
String url = "https://139.9.32.119:18312/common/sms/sendTemplateMessage";
String msisdn = "18090580471";
String smsTemplateId = "SMS_21092300061";
Map<String, String> templateParas = new HashMap<String, String>();
templateParas.put("code", "123456");
String account = "760887"; //实际账号
String password = "Z.o'&mO%7_?5M,Br"; //实际密码
// If the request body does not contain the signature name, set signature to null.
Map<String, Object> body = buildRequestBody(msisdn, smsTemplateId, templateParas, account, password);
if (null == body || body.isEmpty()) {
System.out.println("body is null.");
return "";
}
HttpsURLConnection connection = null;
InputStream is = null;
BufferedReader br = null;
trustAllHttpsCertificates();
try {
URL realUrl = new URL(url);
connection = (HttpsURLConnection) realUrl.openConnection();
connection.setHostnameVerifier(DO_NOT_VERIFY);
connection.setDoInput(true); // 设置可输入
connection.setDoOutput(true); // 设置该连接是可以输出的
connection.setRequestMethod("POST"); // 设置请求方式
connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
// connection.connect();
ObjectMapper objectMapper = new ObjectMapper();
PrintWriter pw = new PrintWriter(new OutputStreamWriter(connection.getOutputStream(), "UTF-8"));
pw.write(objectMapper.writeValueAsString(body));
pw.flush();
pw.close();
br = new BufferedReader(new InputStreamReader(connection.getInputStream(), "utf-8"));
int status = connection.getResponseCode();
if (200 == status) { // 200
is = connection.getInputStream();
} else { // 400/401
is = connection.getErrorStream();
}
br = new BufferedReader(new InputStreamReader(is, "UTF-8"));
String line = null;
StringBuilder result = new StringBuilder();
while ((line = br.readLine()) != null) { // 读取数据
result.append(line + "");
}
connection.disconnect();
System.out.println(result.toString());
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (null != is) {
is.close();
}
if (null != br) {
br.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
return "";
}
// msisdn, smsTemplateId, paramValues, countryID
public static Map<String, Object> buildRequestBody(String msisdn, String smsTemplateId,
Map<String, String> paramValues, String accout, String passward) {
if (null == msisdn || null == smsTemplateId || null == accout || null == passward) {
System.out.println(
"buildRequestBody(): mobiles, templateId or templateParas or account or password is null.");
return null;
}
Map<String, Object> map = new HashMap<String, Object>();
List<MtSmsMessageModel> requestLists = new ArrayList<MtSmsMessageModel>();
MtSmsMessageModel mtSmsMessage = new MtSmsMessageModel();
List<String> mobiles = new ArrayList<String>();
mobiles.add(msisdn);
mtSmsMessage.setMobiles(mobiles);
mtSmsMessage.setTemplateId(smsTemplateId);
mtSmsMessage.setTemplateParas(paramValues);
mtSmsMessage.setSignature("【嗨森逛】");
requestLists.add(mtSmsMessage);
map.put("account", accout);
map.put("password", passward);
map.put("requestLists", requestLists);
return map;
}
static void trustAllHttpsCertificates() throws Exception {
TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager() {
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
return;
}
@Override
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
return;
}
@Override
public X509Certificate[] getAcceptedIssuers() {
return null;
}
}
};
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, null);
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
}
}

@ -690,12 +690,12 @@ public interface HighOrderMapperExt {
@Select(value = { @Select(value = {
"<script>", "<script>",
"select sum(total_price) orderPrice, sum(pay_real_price) payRealPrice , count(*) count ", "select sum(total_price) orderPrice, sum(pay_price) payRealPrice , count(*) count ",
"from high_order where order_status in (2,3) and pay_type in (1,2,3,5) and Identification_code = #{code} ", "from high_order where order_status in (2,3) and pay_type in (1,2,3,5) and Identification_code = #{code} ",
"</script>" "</script>"
}) })
@Results({ @Results({
@Result(column="payPrice", property="payPrice", jdbcType=JdbcType.DECIMAL), @Result(column="payRealPrice", property="payRealPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="orderPrice", property="orderPrice", jdbcType=JdbcType.DECIMAL), @Result(column="orderPrice", property="orderPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="count", property="count", jdbcType=JdbcType.BIGINT), @Result(column="count", property="count", jdbcType=JdbcType.BIGINT),
}) })

@ -13,6 +13,7 @@ public enum OrderPushType {
type4(4 , "电影票订单"), type4(4 , "电影票订单"),
type5(5 , "汇联通会员卡"), type5(5 , "汇联通会员卡"),
type6(6 , "汇联通卡券"), type6(6 , "汇联通卡券"),
type7(7 , "汇联通会员充值订单"),
; ;
private Integer type; private Integer type;

@ -234,6 +234,6 @@ public class HighUserServiceImpl implements HighUserService {
public Boolean findGoldRepeat(Integer resType, Long resId) { public Boolean findGoldRepeat(Integer resType, Long resId) {
HighGoldRecExample example = new HighGoldRecExample(); HighGoldRecExample example = new HighGoldRecExample();
example.createCriteria().andResIdEqualTo(resId).andResTypeEqualTo(resType); example.createCriteria().andResIdEqualTo(resId).andResTypeEqualTo(resType);
return highGoldRecMapper.selectByExample(example) != null; return highGoldRecMapper.selectByExample(example).size() == 0;
} }
} }

@ -506,7 +506,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
// 金币退款 // 金币退款
if (order.getPayType() == 3) { if (order.getPayType() == 3) {
if (!highUserService.findGoldRepeat(3 , order.getId())) { if (highUserService.findGoldRepeat(3 , order.getId())) {
highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId()); highUserService.goldHandle(order.getUserId(), order.getPayRealPrice().multiply(BigDecimal.valueOf(100)).intValue(), 1, 3, order.getId());
}else { }else {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "已有退款记录");

@ -355,7 +355,7 @@ public class GoodsOrderServiceImpl implements PayService {
dataMap.put("goodsDesc", goodsDesc); dataMap.put("goodsDesc", goodsDesc);
dataMap.put("tranDesc", tranDesc); dataMap.put("tranDesc", tranDesc);
HighGasOrderPush payPush = new HighGasOrderPush(); HighGasOrderPush payPush = new HighGasOrderPush();
payPush.setType(OrderPushType.type5.getType()); payPush.setType(OrderPushType.type7.getType());
payPush.setOrderNo(order.getOrderNo()); payPush.setOrderNo(order.getOrderNo());
payPush.setCreateTime(new Date()); payPush.setCreateTime(new Date());
payPush.setCode(deposit.getString("respCode")); payPush.setCode(deposit.getString("respCode"));

@ -31,11 +31,11 @@ HltMembershipLevelSignCode = 7854B96C
# ?????? # ??????
unionPayUrl=https://open.eycard.cn:8443/WorthTech_Access_AppPaySystemV2/apppayacc unionPayUrl=https://open.eycard.cn:8443/WorthTech_Access_AppPaySystemV2/apppayacc
unionPayChannelid=D01X00000801226 unionPayChannelid=D01X00000801226
unionPayMerid=531000009488145 unionPayMerid=83169055983W000
unionPayTermid=39339061 unionPayTermid=XS000103
unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
unionPayNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notify unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
unionPayTelNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notifyTel unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel
unionStagingPayUrl=https://mtest.eycard.cn/ unionStagingPayUrl=https://mtest.eycard.cn/
unionStagingPayOrgId=ORG000000000001 unionStagingPayOrgId=ORG000000000001

Loading…
Cancel
Save