云发单兼容动态+商品详情

yujian

2020-06-02 770ede03b2e532ff3729a8f447bdb4351637ca63

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

@@ -32,6 +32,7 @@
import com.yeshi.fanli.entity.bus.user.cloud.UserCloudGroup;

import com.yeshi.fanli.entity.bus.user.cloud.UserCloudManage;

import com.yeshi.fanli.entity.bus.user.cloud.UserCloudOrder;

import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.taobao.TaoKeApiException;

@@ -40,6 +41,7 @@
import com.yeshi.fanli.exception.user.cloud.UserCloudGoodsException;

import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;

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;

@@ -87,6 +89,11 @@


   @Resource

   private UserCloudAlipayManager userCloudAlipayManager;

	
   @Resource

   private GoodsEvaluateService goodsEvaluateService;

	
	


   /**

    * 查询开通记录

@@ -750,14 +757,19 @@
    * @param out

    */

   @RequestMapping(value = "sendGoods")

   public void sendCircle(String callback, AcceptData acceptData, Long uid, Long goodsId, Integer goodsType, PrintWriter out) {

   public void sendGoods(String callback, AcceptData acceptData, Long uid, Long goodsId, Integer goodsType, PrintWriter out) {

      if (uid == null || goodsId == null || goodsType == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("参数不能为空"));

         return;

      }

      

      try {

         userCloudService.sendCustomGoods(uid, goodsId, goodsType);

         GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsId +"", goodsType);

         if (evaluate != null) {

            userCloudService.sendByDynamic(uid, evaluate.getId());

         } else {

            userCloudService.sendCustomGoods(uid, goodsId, goodsType);

         }

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("一键发单成功"));

      } catch (UserCloudException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));