浏览代码

修改支付bug

wangyuanbo 2 年之前
父节点
当前提交
ec9c3c4707

+ 1 - 7
imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -127,18 +127,15 @@ public class AndroidApi {
 
 //        生成本地订单
         Order preOrder = new Order();
-//        preOrder.setId(IdUtil.getSnowflake(1, 1).nextId());
         preOrder.setOrderSpecs(speId);
         preOrder.setOrderStatus("0");
         preOrder.setOrderGoodsAmount(1);
         preOrder.setOrderAmount(spe.getSpecSPrice());
         preOrder.setOrderUnitPrice(spe.getSpecSPrice());
         preOrder.setOrderGoodsId(spe.getGoodsId());
-//        preOrder.setCreateTime(LocalDateTime.now());
         preOrder.setOrderEquId(equId);
         orderService.save(preOrder);
 //        配方信息
-//        ProductConfig productConfig = productConfigService.getProdCfg(speId);
         List<Formula> productConfig = formulaService.list(new QueryWrap<Formula>().eq("formula_spe_id", speId));
 
 //        小程序码
@@ -147,15 +144,11 @@ public class AndroidApi {
         if (accessToken == null) {
 
             token = goodsService.getToken(accessTokenUrl, appId, secret);
-            System.out.println("redis中获取access_token失败,通过接口获得==" + token);
             redisTemplate.opsForValue().set("access_token", token, 7000, TimeUnit.SECONDS);
         } else {
             token = (String) accessToken;
         }
-
-        System.out.println("小程序授权码tokenStr=" + token);
         if (token == "") {
-            return R.fail("获取小程序access_token失败");
         }
 
 
@@ -165,6 +158,7 @@ public class AndroidApi {
         resultMap.put("orderId", preOrder.getId());
         resultMap.put("productCfg", productConfig);
         resultMap.put("qrCode", qrCode);
+        System.out.println("安卓端下单返回==" + resultMap.toString());
 
         return R.success(resultMap);
     }

+ 3 - 1
imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/MiniApp.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import java.math.BigDecimal;
 import java.security.cert.X509Certificate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -102,13 +103,14 @@ public class MiniApp {
 
         LocalDateTime createTime = localOrder.getCreateTime();
         LocalDateTime expireTime = createTime.plusSeconds(59);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss+08:00").withZone(ZoneId.of("Asia/Shanghai"));;
         String strET = expireTime.format(formatter);
         unifiedorderDto.setTime_expire(strET);
 
 
         String prepayId = null;
         try {
+
             prepayId = wxPayService.wxUnifiedorder(unifiedorderDto);
         } catch (Exception e) {
 

+ 0 - 2
imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/interceptor/WxTokenHandlerInterceptor.java

@@ -58,10 +58,8 @@ public class WxTokenHandlerInterceptor extends HandlerInterceptorAdapter {
         String uri = request.getRequestURI();
         String wxToken = "";
         try {
-            //获取token, 解析,然后想信息放入 heade
             //3, 获取token
             wxToken = getHeader("wxToken", request);
-            System.out.println("从请求头获取到wxtoken===" + wxToken);
             // 4, 解析 并 验证 token
             Claims claims = JwtUtil.parseJWT(wxToken);
 

+ 1 - 0
imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/service/WxPayService.java

@@ -30,6 +30,7 @@ public class WxPayService {
 
     //    调用微信统一下单接口
     public String wxUnifiedorder(UnifiedorderDto unifiedorderDto) throws Exception {
+        System.out.println("微信统一下单接口入参="+unifiedorderDto.toString());
         HttpPost httpPost = new HttpPost(wxPayCfg.getWxUnifiedorder());
         Object o = JSONArray.toJSON(unifiedorderDto);
         String reqData = o.toString();

文件差异内容过多而无法显示
+ 0 - 0
imcs-bt-fe/imcs-bt-fe/imcs-ui/imcs-ui/index.html


二进制
imcs-bt-fe/imcs-bt-fe/imcs-ui/imcs-ui/static/js/app.0b745c8d.js.gz


文件差异内容过多而无法显示
+ 0 - 0
imcs-bt-fe/imcs-bt-fe/imcs-ui/imcs-ui/static/js/app.522eb04f.js


二进制
imcs-bt-fe/imcs-bt-fe/imcs-ui/imcs-ui/static/js/app.522eb04f.js.gz


文件差异内容过多而无法显示
+ 0 - 0
imcs-bt-fe/imcs-bt-fe/imcs-ui/imcs-ui/static/js/chunk-5ad74af0.6bc8af38.js


二进制
imcs-bt-fe/imcs-bt-fe/imcs-ui/imcs-ui/static/js/chunk-5ad74af0.6bc8af38.js.gz


二进制
imcs-bt-fe/imcs-bt-fe/imcs-ui/imcs-ui/static/js/chunk-5ad74af0.c03f5a33.js.gz


部分文件因为文件数量过多而无法显示