fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
@@ -35,6 +35,7 @@ import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.exception.user.cloud.UserCloudException; import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException; import com.yeshi.fanli.exception.user.cloud.UserCloudOrderException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService; @@ -720,6 +721,34 @@ /** * 支付完成 * * @param id * @param out */ @RequestMapping(value = "payEnd") public void payEnd(String callback, AcceptData acceptData, Long uid, Long id, PrintWriter out) { if (uid == null || id == null) { out.print(JsonUtil.loadFalseResult(1, "参数信息缺失")); return; } try { // 检测是否支付完成 userCloudAlipayManager.tradeQueryByOrderId(id); UserCloudOrder cloudOrder = userCloudOrderService.selectByPrimaryKey(id); JSONObject dataObject = new JSONObject(); dataObject.put("money", cloudOrder.getMoney()); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dataObject)); } catch (Exception e) { out.print(JsonUtil.loadFalseResult(1, "回调信息失败")); LogHelper.errorDetailInfo(e); } } /** * 动态一键发单 * @param callback * @param acceptData fanli/src/main/java/com/yeshi/fanli/entity/bus/user/cloud/CloudOrderMenuEnum.java
@@ -3,7 +3,7 @@ import com.yeshi.fanli.util.StringUtil; public enum CloudOrderMenuEnum { robotMonth(20, 4, 1, "全能机器人", "一个月"); robotMonth(20.00, 4, 1, "全能机器人", "一个月"); private double money; private Integer robotType; fanli/src/main/java/com/yeshi/fanli/service/impl/user/cloud/UserCloudOrderServiceImpl.java
@@ -72,7 +72,7 @@ UserCloudOrder updateOrder = new UserCloudOrder(); updateOrder.setState(true); updateOrder.setId(cloudOrder.getId()); updateOrder.setDesc("成功开通" + updateOrder.getType().getDescShow()); updateOrder.setDesc("成功开通" + cloudOrder.getType().getDescShow()); updateOrder.setUpdateTime(new Date()); userCloudOrderMapper.updateByPrimaryKeySelective(updateOrder);
@@ -87,7 +87,7 @@ payDTO.setProductCode(type); payDTO.setTotalAmount(menuEnum.getMoney() + ""); payDTO.setTimeoutExpress("30m"); payDTO.setReturnUrl(configService.get(ConfigKeyEnum.cloudAlipayReturnLink.getKey())); payDTO.setReturnUrl(configService.get(ConfigKeyEnum.cloudAlipayReturnLink.getKey()) +"?id=" +cloudOrder.getId()); payDTO.setNotifyUrl(configService.get(ConfigKeyEnum.cloudAlipayNotifyLink.getKey()) +"?id=" +cloudOrder.getId()); // 获取支付form fanli/src/main/java/com/yeshi/fanli/util/aitaoker/AitaokerApiUtil.java
@@ -270,7 +270,7 @@ // " \"is_new\":1\r\n" + // " }\r\n" + // "}"; // JSONObject resultJson = JSONObject.fromObject(result); if ("0000".equals(resultJson.optString("status"))) { resultJson = resultJson.optJSONObject("data");
