云发单金额修改，增加获取电话号码接口

admin

2020-06-16 5f13dcc8eaac7cd26c0ec41bd1b3efbb70a08180

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java

@@ -35,9 +35,11 @@
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;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.cloud.UserCloudGoodsService;

@@ -55,6 +57,7 @@
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.suning.SuningUtil;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.homemodule.BannerVO;

import com.yeshi.fanli.vo.user.cloud.CloudOrderMenuVO;

import com.yeshi.fanli.vo.user.cloud.UserCloudInfoVO;



@@ -98,6 +101,8 @@
   @Resource

   private RedisManager redisManager;

   

   @Resource

   private SwiperPictureService swiperPictureService;



   /**

    * 查询开通记录

@@ -237,7 +242,15 @@
            }

         }

      }

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(cloudInfoVO));

		
      // 教程

      List<BannerVO> listBanner = swiperPictureService.getByBannerCard("cloud_course");

      if (listBanner != null && listBanner.size() > 0) {

         cloudInfoVO.setCourse(listBanner.get(0));

      }

      GsonBuilder gsonBuilder = new GsonBuilder();

		
      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(gsonBuilder.create().toJson(cloudInfoVO)));

   }



   /**

@@ -569,7 +582,11 @@
                  commonGoods.setState(2);

               }

            }



				 
            if (state != null && state == UserCloudGoods.STATE_INVALID) {

               commonGoods.setState(1);

            }

				
            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);

            detailVO.setId(commonGoods.getId());



@@ -705,6 +722,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