From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 09 六月 2020 17:34:30 +0800 Subject: [PATCH] 订单 --- fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java | 77 +++++++++++++++----------------------- 1 files changed, 31 insertions(+), 46 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java index 4d98a73..2eddfeb 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java @@ -12,7 +12,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Scanner; import javax.annotation.Resource; import javax.crypto.Mac; @@ -24,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.yeshi.utils.JsonUtil; import org.yeshi.utils.taobao.TbImgUtil; import org.yeshi.utils.wx.WXUtil; @@ -33,11 +31,9 @@ import com.yeshi.fanli.dto.ConfigParamsDTO; import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum; import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg; -import com.yeshi.fanli.dto.push.PushContentDTO; import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser; import com.yeshi.fanli.entity.bus.activity.ActivityUser; import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState; -import com.yeshi.fanli.entity.config.push.PushMsgFactory; import com.yeshi.fanli.entity.dynamic.ImgInfo; import com.yeshi.fanli.entity.dynamic.ImgInfo.ImgEnum; import com.yeshi.fanli.entity.dynamic.SimpleGoods; @@ -45,13 +41,13 @@ import com.yeshi.fanli.entity.shop.BanLiShopOrder; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.exception.dynamic.GoodsEvaluateException; -import com.yeshi.fanli.exception.push.PushException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.activity.ActivityUserService; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService; import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService; +import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService; import com.yeshi.fanli.service.inter.order.config.HongBaoManageService; import com.yeshi.fanli.service.inter.push.PushService; import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService; @@ -98,6 +94,9 @@ @Resource private HongBaoManageService hongBaoManageService; + + @Resource + private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService; @Resource private ActivityUserService activityUserService; @@ -165,17 +164,6 @@ String uid = json.optJSONObject("customizedData").optString("鐢ㄦ埛ID"); msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, customizedId, "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date()); - if (!StringUtil.isNullOrEmpty(uid))// 鎺ㄩ�佸鏈嶆秷鎭� - { - PushContentDTO dto = PushMsgFactory.createMsgKefu(); - try { - pushService.pushZNX(Long.parseLong(uid), dto.getTitle(), dto.getContent(), null, null); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (PushException e) { - e.printStackTrace(); - } - } } } @@ -204,6 +192,19 @@ @RequestMapping(value = "vip") public void VIP(PrintWriter out) { + out.print("success"); + } + + /** + * 鏀粯瀹濇敮浠樺洖璋� + * @Title: alipay + * @Description: + * @param out + * void 杩斿洖绫诲瀷 + * @throws + */ + @RequestMapping(value = "alipay") + public void alipay(PrintWriter out) { out.print("success"); } @@ -257,43 +258,25 @@ // return; // } String contentDecode = ""; - if (request instanceof MultipartHttpServletRequest) { - MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; - List<MultipartFile> files = multipartRequest.getFiles("file"); - try { - InputStream input = files.get(0).getInputStream(); - InputStreamReader reader = new InputStreamReader(input, "UTF-16LE"); - int d = -1; - String st = ""; - while ((d = reader.read()) != -1) { - st += ((char) d); - } - System.out.println(st); - contentDecode = st; - contentDecode = contentDecode.substring(contentDecode.indexOf("mtopjsonp1(") + "mtopjsonp1(".length(), - contentDecode.length()).trim(); - if (contentDecode.endsWith(")")) - contentDecode = contentDecode.substring(0, contentDecode.length() - 1); + contentDecode = content.substring(content.indexOf("(") + 1, content.length()).trim(); + if (contentDecode.endsWith(")")) + contentDecode = contentDecode.substring(0, contentDecode.length() - 1); - System.out.println(contentDecode); - - reader.close(); - - } catch (IOException e) { - e.printStackTrace(); - } - } + System.out.println(contentDecode); JSONObject data = JSONObject.fromObject(contentDecode).optJSONObject("data"); JSONArray array = data.optJSONObject("recommend").optJSONArray("resultList"); - for (int i = array.size()-1; i >=0; i--) { + + long startTime=System.currentTimeMillis(); + + for (int i = array.size() - 1; i >= 0; i--) { JSONObject item = array.optJSONObject(i); String title = item.optString("itemName"); String doc = item.optString("cusShareText"); long itemId = item.optLong("itemId"); - String publishTime=item.optString("cusPublishTime"); + String publishTime = item.optString("cusPublishTime"); JSONArray imageArray = item.optJSONArray("imageList"); List<String> imgList = new ArrayList<>(); for (int j = 0; j < imageArray.size(); j++) { @@ -309,7 +292,7 @@ if (goodsBrief == null) continue; // 鍟嗗搧VO - ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate("android", "55"); + ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate("android", "55"); paramsDTO.setBaseFanliRate(hongBaoManageService.getBaseFanliRate()); GoodsDetailVO goodsVO = GoodsDetailVOFactory.convertTaoBao(goodsBrief, paramsDTO); @@ -334,7 +317,7 @@ } else { imgInfo.setType(ImgEnum.goods); SimpleGoods simpleGoods = new SimpleGoods(); - simpleGoods.setGoodsId(itemId); + simpleGoods.setGoodsId(itemId + ""); simpleGoods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO); simpleGoods.setState(CommonGoods.STATE_NORMAL); CouponInfoVO couponInfo = goodsVO.getCouponInfo(); @@ -354,9 +337,11 @@ ActivityUser user = ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser(); try { - goodsEvaluateService.addGoodsEvaluate(itemId, imageList, user, doc, null, null); + goodsEvaluateService.addGoodsEvaluate(itemId + "", imageList, user, doc, null, new Date(startTime-1000*60*20L*i)); } catch (GoodsEvaluateException e) { e.printStackTrace(); + }catch(Exception e){ + e.printStackTrace(); } } -- Gitblit v1.8.0