更改跳转https bug和更换logo
This commit is contained in:
zhujunshuai
@@ -65,6 +65,7 @@ public class ViewResolverConfiguration{
|
||||
viewResolver.setSuffix(".jsp");
|
||||
viewResolver.setContentType("text/html");
|
||||
viewResolver.setOrder(2);
|
||||
viewResolver.setRedirectHttp10Compatible(false);
|
||||
return viewResolver;
|
||||
}
|
||||
|
||||
|
||||
@@ -91,6 +91,7 @@ import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
import org.springframework.web.servlet.view.RedirectView;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.Cookie;
|
||||
@@ -239,7 +240,7 @@ public class MerchantController {
|
||||
DeviceStock stock = new DeviceStock();
|
||||
stock.setDeviceNo(JtyConstant.TEST_DEVICE_NUM);
|
||||
String data = jtyDeviceHandler.sendNotice(Double.parseDouble(comsumeMoney), "pay", stock);
|
||||
return ResultGenerator.genSuccessResult("支付成功！","【佳天亿】支付成功消息推送响应参数:"+data);
|
||||
return ResultGenerator.genSuccessResult("支付成功！", "【佳天亿】支付成功消息推送响应参数:" + data);
|
||||
}
|
||||
|
||||
@GetMapping("/cancelPayTest/{comsumeMoney}")
|
||||
@@ -249,7 +250,7 @@ public class MerchantController {
|
||||
DeviceStock stock = new DeviceStock();
|
||||
stock.setDeviceNo(JtyConstant.TEST_DEVICE_NUM);
|
||||
String data = jtyDeviceHandler.sendNotice(Double.parseDouble(comsumeMoney), "cancel", stock);
|
||||
return ResultGenerator.genSuccessResult("操作成功","【佳天亿】取消支付消息推送响应参数:"+data);
|
||||
return ResultGenerator.genSuccessResult("操作成功", "【佳天亿】取消支付消息推送响应参数:" + data);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return ResultGenerator.genFailResult(e.getMessage());
|
||||
@@ -383,14 +384,14 @@ public class MerchantController {
|
||||
MerchantMoveRecords record = merchantMoveRecordsService.getOne(queryWrapper);
|
||||
if (record == null) {
|
||||
JftReceiptInfo byToken = jftReceiptInfoMapper.getByToken(token);
|
||||
if(byToken == null){
|
||||
if (byToken == null) {
|
||||
request.setAttribute("error", "参数有误！");
|
||||
return "merchant/errorInfo2";
|
||||
}
|
||||
JftMercBaseInfo merchant = jftMercBaseInfoService.getMercBaseInfo(byToken.getUserId());
|
||||
List<JftReceiptOrder> lists = jftReceiptOrderMapper.listByReceiptId(byToken.getId(), JftReceiptOrder.PAY_STATUS_YES);
|
||||
request.setAttribute("mercName", merchant.getMerchantName());
|
||||
if(!lists.isEmpty()){
|
||||
if (!lists.isEmpty()) {
|
||||
request.setAttribute("orderNumber", lists.get(0).getOrderNumber());
|
||||
}
|
||||
request.setAttribute("merchantCode", merchant.getMerchantCode());
|
||||
@@ -1506,6 +1507,9 @@ public class MerchantController {
|
||||
}
|
||||
}
|
||||
String domain_wap = ParametersUtil.domain + "/wap";
|
||||
|
||||
log.info("跳转域名", domain_wap);
|
||||
|
||||
String APP_ID = ParametersUtil.APPID;
|
||||
String ali_appid = ParametersUtil.ZY_ALI_APP_ID;
|
||||
String url = "/merchant/h5pay?userAppId=" + userAppId;
|
||||
@@ -1746,11 +1750,11 @@ public class MerchantController {
|
||||
*/
|
||||
@GetMapping("/scanPay")
|
||||
public ModelAndView scanPay(HttpServletRequest request, HttpServletResponse response, String tk,
|
||||
String code,
|
||||
String auth_code,
|
||||
String userAuthCode,
|
||||
String userId,
|
||||
String payType) {
|
||||
String code,
|
||||
String auth_code,
|
||||
String userAuthCode,
|
||||
String userId,
|
||||
String payType) {
|
||||
return merchantService.scanPay(request, response, tk, code, auth_code, userAuthCode, userId, payType);
|
||||
}
|
||||
|
||||
@@ -1817,7 +1821,8 @@ public class MerchantController {
|
||||
attrs.addAttribute("storeId", merchantStore.getStoreId());
|
||||
attrs.addAttribute("userAppId", userApp.getUserId());
|
||||
attrs.addAttribute("qrNo", qrNo);
|
||||
view.setViewName("redirect:/merchant/auth");
|
||||
//view.setViewName("redirect:/merchant/auth");
|
||||
view.setView(new RedirectView("/merchant/auth?merchantCode" + merchantCode + "&storeId" + merchantStore.getStoreId() + "&userAppId=" + userApp.getUserId() + "&qrNo=" + qrNo, true, false));
|
||||
return view;
|
||||
}
|
||||
|
||||
@@ -2519,7 +2524,7 @@ public class MerchantController {
|
||||
|
||||
userApp.setParentId(parentInfo.getUserId());
|
||||
UserApp.setSort(parentInfo, userApp);
|
||||
UserApp.setRoleInfo(parentInfo, userApp,null);
|
||||
UserApp.setRoleInfo(parentInfo, userApp, null);
|
||||
|
||||
userApp.setUserName(phone);
|
||||
userApp.setUserType("promoter");
|
||||
@@ -2536,7 +2541,7 @@ public class MerchantController {
|
||||
phoneValidateCodeService.deletePhoneValidateCode(phoneValidate);
|
||||
}
|
||||
// TODO 同步用户到积分商城系统这边
|
||||
jfShopHandler.syncJfShopUser(userApp,userInfo);
|
||||
jfShopHandler.syncJfShopUser(userApp, userInfo);
|
||||
return ResultGenerator.genSuccessResult("注册成功!", null);
|
||||
}
|
||||
}
|
||||
@@ -3279,7 +3284,7 @@ public class MerchantController {
|
||||
merchantOrder.setOrderNumber(ordersSn);
|
||||
MerchantOrder order = merchantOrderService.queryMerchantOrder(merchantOrder);
|
||||
if (order != null) {
|
||||
merchantProfitService.createOrderProfitV2(order,"1");
|
||||
merchantProfitService.createOrderProfitV2(order, "1");
|
||||
} else {
|
||||
log.error("===================添加推广分润失败，当前订单号：{}不存在<==============", ordersSn);
|
||||
}
|
||||
@@ -3952,26 +3957,26 @@ public class MerchantController {
|
||||
}
|
||||
|
||||
@GetMapping(value = "/wxLocation")
|
||||
public ModelAndView wxLocation(ModelAndView view,HttpServletRequest request,String storeId,String appOpenId) {
|
||||
public ModelAndView wxLocation(ModelAndView view, HttpServletRequest request, String storeId, String appOpenId) {
|
||||
String appId = ParametersUtil.APPID;
|
||||
String noncestr = StringUtil.generateMixStr(10);
|
||||
Long timestamp = System.currentTimeMillis() / 1000;
|
||||
StringBuffer requestURL = request.getRequestURL();
|
||||
if(StringUtil.isNotEmpty(request.getQueryString())){
|
||||
requestURL.append("?"+request.getQueryString());
|
||||
if (StringUtil.isNotEmpty(request.getQueryString())) {
|
||||
requestURL.append("?" + request.getQueryString());
|
||||
}
|
||||
WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(appId, ParametersUtil.APPSECRET,null, WxConstants.ACCESS_TOKEN_URL);
|
||||
String jsapiTicket = wxCommonService.getJsapiTicket(tokenRequest,"jsapi");
|
||||
String signStr = "jsapi_ticket="+jsapiTicket +"&noncestr="+noncestr +"×tamp="+ timestamp + "&url="+requestURL.toString();
|
||||
WxAccessTokenRequest tokenRequest = WxAccessTokenRequest.buidWxToken(appId, ParametersUtil.APPSECRET, null, WxConstants.ACCESS_TOKEN_URL);
|
||||
String jsapiTicket = wxCommonService.getJsapiTicket(tokenRequest, "jsapi");
|
||||
String signStr = "jsapi_ticket=" + jsapiTicket + "&noncestr=" + noncestr + "×tamp=" + timestamp + "&url=" + requestURL.toString();
|
||||
String sign = SignUtils.sha1Encrypt(signStr);
|
||||
|
||||
view.addObject("appId",appId);
|
||||
view.addObject("noncestr",noncestr);
|
||||
view.addObject("timestamp",timestamp);
|
||||
view.addObject("sign",sign);
|
||||
view.addObject("appId", appId);
|
||||
view.addObject("noncestr", noncestr);
|
||||
view.addObject("timestamp", timestamp);
|
||||
view.addObject("sign", sign);
|
||||
|
||||
view.addObject("storeId",storeId);
|
||||
view.addObject("appOpenId",appOpenId);
|
||||
view.addObject("storeId", storeId);
|
||||
view.addObject("appOpenId", appOpenId);
|
||||
view.setViewName("merchant/wxLocation");
|
||||
return view;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user