|
@@ -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);
|
|
|
}
|