fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java
@@ -3,14 +3,14 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.UUID; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import net.sf.json.JSONObject; import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Controller; @@ -23,13 +23,22 @@ import com.yeshi.fanli.entity.common.AdminUser; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.AdminUserService; import com.yeshi.fanli.service.inter.hongbao.HongBaoService; import com.yeshi.fanli.service.inter.order.OrderProcessService; import com.yeshi.fanli.service.inter.order.OrderService; import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService; import com.yeshi.fanli.util.CMQManager; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.TimeUtil; import com.yeshi.fanli.util.annotation.RequestNoLogin; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; import freemarker.core.ArithmeticEngine.ConservativeEngine; import net.sf.json.JSONObject; @Controller @RequestMapping("admin/new/api/v1/upload") @@ -50,7 +59,11 @@ @Resource(name = "taskExecutor") private TaskExecutor executor; @Resource private TaoBaoOrderService taoBaoOrderService; @Resource private RedisManager redisManager; // private static final String PAYSUCCESS = "支付成功"; // private static final String ORDERCLOSE="订单关闭"; @@ -67,8 +80,8 @@ InputStream inputStream = file.getInputStream(); String contentType = file.getContentType(); String type = contentType.substring(contentType.indexOf("/") + 1); String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl(); String uploadFilePath = COSManager.getInstance() .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type).getUrl(); out.print(JsonUtil.loadTrueResult(uploadFilePath)); } catch (IOException e) { e.printStackTrace(); @@ -90,8 +103,9 @@ InputStream inputStream = file.getInputStream(); String contentType = file.getContentType(); String type = contentType.substring(contentType.indexOf("/") + 1); String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk").getUrl(); String uploadFilePath = COSManager.getInstance() .uploadFile(inputStream, UUID.randomUUID().toString().replace("-", "") + "." + type + ".apk") .getUrl(); out.print(JsonUtil.loadTrueResult(uploadFilePath)); } catch (Exception e) { e.printStackTrace(); @@ -107,8 +121,8 @@ String date = TimeUtil.getyyyyMMdd(timeMillis); String contentType = file.getContentType(); String type = contentType.substring(contentType.indexOf("/") + 1); String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, "section/" + date + "/" + timeMillis + "." + type).getUrl(); String uploadFilePath = COSManager.getInstance() .uploadFile(inputStream, "section/" + date + "/" + timeMillis + "." + type).getUrl(); JSONObject data = new JSONObject(); data.put("original", file.getOriginalFilename()); data.put("name", file.getOriginalFilename()); @@ -124,13 +138,73 @@ } } private void addOrder(List<TaoBaoOrder> orderList) { try { taoBaoOrderService.addTaoBaoOrderList(orderList); } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch (Exception e1) { e1.printStackTrace(); } } try { Map<String, List<TaoBaoOrder>> map = TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList); if (map != null) { Iterator<String> its = map.keySet().iterator(); while (its.hasNext()) { String key = its.next(); List<TaoBaoOrder> orders = map.get(key); String redisKey = "addorderqueue-" + key; // redis做频率限制 if (Constant.IS_OUTNET) { try { if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(redisKey))) { continue; } } catch (Exception e) { } } CMQManager.getInstance().addTaoBaoOrderMsg(key, orders); try { // 6小时内不再处理 if (Constant.IS_OUTNET) { redisManager.cacheCommonString(redisKey, "1", 60 * 60 * 6); } } catch (Exception e) { } } } } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch (Exception e1) { e1.printStackTrace(); } } } @RequestMapping(value = "uploadOrder", method = RequestMethod.POST) public void uploadOrder(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) { if (file != null) { try { List<TaoBaoOrder> orderList = TaoBaoOrderUtil.parseOrder(file.getInputStream()); orderProcessService.processOrder(TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList)); // for(int i=0;i<orderList.size();i++) // { // if(!orderList.get(i).getOrderId().equalsIgnoreCase("229978886132510070")&&!orderList.get(i).getOrderId().equalsIgnoreCase("246314979024510070")) // { // orderList.remove(i--); // continue; // } // // } // orderProcessService.processOrder(TaoBaoOrderUtil.classifyTaoBaoOrderByOrderId(orderList)); addOrder(orderList); } catch (IOException e) { e.printStackTrace(); out.print(JsonUtil.loadFalseResult(e.getMessage())); @@ -143,19 +217,21 @@ } /** * 新后台端 上传订单文件 * @param file excel文件 * @param uid 当前用户id * * @param file * excel文件 * @param uid * 当前用户id * @param request * @param response * @param out */ @RequestNoLogin() @RequestMapping(value = "uploadOrderFile") public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletRequest request, HttpServletResponse response, PrintWriter out) { public void uploadOrderFile(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletRequest request, HttpServletResponse response, PrintWriter out) { response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Methods", "*"); @@ -198,16 +274,16 @@ } /** * 上传图片jsonp * * @param file * @param out */ @RequestNoLogin() @RequestMapping(value = "uploadPicture") public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletResponse response, PrintWriter out) { public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, Long uid, HttpServletResponse response, PrintWriter out) { response.setHeader("Access-Control-Allow-Origin", "*"); response.setHeader("Access-Control-Allow-Methods", "*"); fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -204,7 +204,6 @@ @Resource private SwiperPictureService swiperPictureService; @Resource private MonitorService monitorService; @@ -622,37 +621,6 @@ out.print(JsonUtil.loadFalseResult(1, "系统不存在")); return; } // TaoBaoGoodsBrief alimama = TaoBaoUtil.isAlimama(id); TaoBaoGoodsBrief tb = null; try { tb = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id)); } catch (NumberFormatException e1) { e1.printStackTrace(); } catch (TaobaoGoodsDownException e1) { e1.printStackTrace(); } if (tb != null) { tb.setAuctionUrl(null); tb.setId(null); int type = 0; if ("android".equalsIgnoreCase(acceptData.getPlatform())) type = PidUser.TYPE_FANLI_ANDROID; else type = PidUser.TYPE_FANLI_IOS; List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(type); Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); JSONObject data = new JSONObject(); TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0)); if (uid != null && !"".equals(uid.trim())) { CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid), Long.parseLong(id)); data.put("collection", collectionGoods != null ? true : false); } // 获取淘客参数 ClientTBPid clientTBPid = null; // 用户已经登录 @@ -672,7 +640,6 @@ } else { tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS); if (tbPid != null) { String siteId = tbPid.getPid().split("_")[2]; String adzoneId = tbPid.getPid().split("_")[3]; TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId); @@ -681,11 +648,6 @@ clientTBPid = tbPidService.getIOSDefault(); } } if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null) taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(TaoBaoCouponUtil .getCoupleUrl(tb.getCouponActivityId(), tbPid.getPid(), tb.getAuctionId() + "")); } else { if (acceptData.getPlatform().equalsIgnoreCase("android")) clientTBPid = tbPidService.getAndroidDefault(); @@ -693,9 +655,48 @@ clientTBPid = tbPidService.getIOSDefault(); } TaoBaoGoodsBrief tb = null; try { TaoKeAppInfo app = new TaoKeAppInfo(); TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(clientTBPid.getSiteId()); app.setAdzoneId(clientTBPid.getAdZoneId()); app.setAppKey(clientTBPid.getAppKey()); app.setAppSecret(config.getAppSecret()); app.setPid(clientTBPid.getPid()); tb = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app); } catch (NumberFormatException e1) { e1.printStackTrace(); } catch (TaobaoGoodsDownException e1) { out.print(JsonUtil.loadFalseResult(2, "商品已下架")); return; } if (tb != null) { // tb.setAuctionUrl(null); tb.setId(null); int type = 0; if ("android".equalsIgnoreCase(acceptData.getPlatform())) type = PidUser.TYPE_FANLI_ANDROID; else type = PidUser.TYPE_FANLI_IOS; List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(type); Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); JSONObject data = new JSONObject(); TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0)); if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null) taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink()); taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl()); if (uid != null && !"".equals(uid.trim())) { CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid), Long.parseLong(id)); data.put("collection", collectionGoods != null ? true : false); } data.put("tbPidInfo", clientTBPid); taoBaoGoodsBriefExtra.setAuctionUrl(null); // taoBaoGoodsBriefExtra.setAuctionUrl(null); data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra)); String info = configService.get("detail_prompt"); data.put("info", info); @@ -1579,7 +1580,6 @@ out.print(JsonUtil.loadTrueResult(root)); } /** * 新版推荐专题管理(1.4.0) * @@ -1686,8 +1686,6 @@ out.print(JsonUtil.loadTrueResult(root)); } /** * 商品基本详情 (1.4.0) fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBriefExtra.java
@@ -23,7 +23,6 @@ @Expose private int collected; // 0-没有收藏 1-已收藏 public String getTbToken() { return tbToken; } @@ -87,6 +86,5 @@ public void setCollected(int collected) { this.collected = collected; } } fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CollectionGoodsServiceImpl.java
@@ -13,6 +13,7 @@ import com.yeshi.fanli.dao.goods.CollectionGoodsDao; import com.yeshi.fanli.entity.bus.user.CollectionGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; import com.yeshi.fanli.service.inter.goods.CollectionGoodsService; import com.yeshi.fanli.util.Constant; @@ -94,4 +95,45 @@ return null; } @Override public void updateCollectionGoods(TaoBaoGoodsBrief goods) { if (goods != null && goods.getAuctionId() != null) { long count = dao.getCount("select count(*) from CollectionGoods cg where cg.auctionId=?", new Serializable[] { goods.getAuctionId() }); if (count > 0) { int pageSize = 50; int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1); for (int i = 0; i < page; i++) { List<CollectionGoods> list = dao.list("from CollectionGoods cg where cg.auctionId=?", i * pageSize, pageSize, new Serializable[] { goods.getAuctionId() }); if (list != null) for (CollectionGoods cg : list) { cg = getCollectionGoods(cg, goods); if (cg != null) dao.update(cg); } } } } } private static CollectionGoods getCollectionGoods(CollectionGoods collectionGoods, TaoBaoGoodsBrief goods) { if (collectionGoods == null || goods == null) return null; // 更新商品信息（标题，销量,图片,佣金比例，价格，券信息） collectionGoods.setBiz30day(goods.getBiz30day()); collectionGoods.setTitle(goods.getTitle()); collectionGoods.setCouponAmount(goods.getCouponAmount()); collectionGoods.setCouponEffectiveEndTime(goods.getCouponEffectiveEndTime()); collectionGoods.setCouponLeftCount(goods.getCouponLeftCount()); collectionGoods.setCouponEffectiveStartTime(goods.getCouponEffectiveStartTime()); collectionGoods.setCouponStartFee(goods.getCouponStartFee()); collectionGoods.setCouponTotalCount(goods.getCouponTotalCount()); collectionGoods.setTkRate(goods.getTkRate()); collectionGoods.setPictUrl(goods.getPictUrl()); collectionGoods.setZkPrice(goods.getZkPrice()); collectionGoods.setReservePrice(goods.getReservePrice()); return collectionGoods; } } fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -910,7 +910,7 @@ }); } } else if ("订单结算".equals(taoBaoOrder.getOrderState())) {// 更新预估获取时间 BigDecimal money = MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), rate); BigDecimal money = MoneyBigDecimalUtil.mul(taoBaoOrder.geteIncome(), rate); // 设置预计领取时间 long settlementTime = TimeUtil.convertDateToTemp2(taoBaoOrder.getSettlementTime().trim()); // 预计领取时间 @@ -940,7 +940,8 @@ hongBaoMapper.updateByPrimaryKeySelective(updateChildHongBao); }); BigDecimal estimate = taoBaoOrder.getEstimate(); BigDecimal estimate = taoBaoOrder.geteIncome(); updateHongBao.setPayMoney(taoBaoOrder.getSettlement()); updateHongBao.setMoney(MoneyBigDecimalUtil.mul(estimate, rate)); } @@ -985,9 +986,17 @@ // 创建红包 JSONObject data = new JSONObject(); HongBao hongBao = HongBaoFactory.createHongBao(MoneyBigDecimalUtil.mul(baseRate, taoBaoOrder.getEstimate()), HongBao hongBao = null; if (taoBaoOrder.getOrderState().equalsIgnoreCase("订单结算")) // 订单结算应该取结算金额与预估收入 hongBao = HongBaoFactory.createHongBao(MoneyBigDecimalUtil.mul(baseRate, taoBaoOrder.geteIncome()), data.toString(), order.getId(), null, order.getUserInfo(), 1, taoBaoOrder.getSettlement(), taoBaoOrder.getAuctionId()); else hongBao = HongBaoFactory.createHongBao(MoneyBigDecimalUtil.mul(baseRate, taoBaoOrder.getEstimate()), data.toString(), order.getId(), null, order.getUserInfo(), 1, taoBaoOrder.getPayment(), taoBaoOrder.getAuctionId()); hongBao.setOrderId(taoBaoOrder.getOrderId()); hongBao.setOrderItemId(orderItem.getId()); hongBao.setPreGettime(0L); @@ -1024,7 +1033,19 @@ else rate = new BigDecimal(hbm.getValue()).divide(new BigDecimal(100)); if (rate.compareTo(new BigDecimal(0)) > 0) { HongBao hongBao2 = HongBaoFactory.createHongBao( HongBao hongBao2 = null; if (taoBaoOrder.getOrderState().equalsIgnoreCase("订单结算")) { // 订单结算应该取结算金额与预估收入 hongBao2 = HongBaoFactory.createHongBao( MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.geteIncome(), baseRate)), null, hongBao, boss, Constant.ONESALE); } else { hongBao2 = HongBaoFactory.createHongBao( MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)), null, hongBao, boss, Constant.ONESALE); } HongBaoFactory.createHongBao( MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)), null, hongBao, boss, Constant.ONESALE); // 设置订单号 @@ -1050,9 +1071,17 @@ else rate = new BigDecimal(hbm.getValue()).divide(new BigDecimal(100)); if (rate.compareTo(new BigDecimal(0)) > 0) { HongBao hongBao3 = HongBaoFactory.createHongBao( MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)), // 订单结算应该取结算金额与预估收入 HongBao hongBao3 = null; if (taoBaoOrder.getOrderState().equalsIgnoreCase("订单结算")) hongBao3 = HongBaoFactory.createHongBao( MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.geteIncome(), baseRate)), null, hongBao, boss2, Constant.TWOSALE); else hongBao3 = HongBaoFactory.createHongBao( MoneyBigDecimalUtil.mul(rate, MoneyBigDecimalUtil.mul(taoBaoOrder.getEstimate(), baseRate)), null, hongBao, boss2, Constant.TWOSALE); // 设置返利订单号 hongBao3.setOrderId(taoBaoOrder.getOrderId()); fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
@@ -471,6 +471,18 @@ updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime()); updateOrderItem.setState(newOrderItem.getState()); updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount()))); updateOrderItem.setPayMoney(newOrderItem.getPayMoney()); updateOrderItem.setFanMoney(newOrderItem.getFanMoney()); orderItemMapper.updateByPrimaryKeySelective(updateOrderItem); } else if (newOrderItem.getState() == OrderItem.STATE_JIESUAN) { OrderItem updateOrderItem = new OrderItem(); // 处理正常状态 updateOrderItem.setId(oldOrderItem.getId()); updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime()); updateOrderItem.setState(newOrderItem.getState()); updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount()))); updateOrderItem.setPayMoney(newOrderItem.getPayMoney()); updateOrderItem.setFanMoney(newOrderItem.getFanMoney()); orderItemMapper.updateByPrimaryKeySelective(updateOrderItem); }
@@ -394,8 +394,13 @@ } else// 计算订单的总金额 { BigDecimal money = new BigDecimal(0); for (TaoBaoOrder o : orderList) for (TaoBaoOrder o : orderList) { if (o.getOrderState().equalsIgnoreCase("订单结算")) money = money.add(o.getSettlement()); else { money = money.add(o.getPayment()); } } updateOrder.setMoney(money); String thirdState = null; for (TaoBaoOrder o : orderList) fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java
@@ -272,6 +272,9 @@ HongBao.TYPE_SHARE_GOODS, HongBao.STATE_BUKELINGQU, new Date().getTime(), new Date().getTime(), 0, "192.168.1.1", "系统添加"); hongBao.setOrderId(order.getOrderId()); if ("订单结算".equalsIgnoreCase(order.getState())) hongBao.setPayMoney(order.getFinalMoney()); else hongBao.setPayMoney(order.getPayMoney()); if (order.getBalanceTime() != null) hongBao.setBalanceTime(order.getBalanceTime()); fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoGoodsUpdateServiceImpl.java
@@ -16,6 +16,7 @@ import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException; import com.yeshi.fanli.service.inter.activity.ActivityService; import com.yeshi.fanli.service.inter.goods.CollectionGoodsService; import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService; import com.yeshi.fanli.service.inter.lable.QualityFactoryService; import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService; @@ -36,6 +37,9 @@ @Resource private TaoBaoGoodsBriefMapper taoBaoGoodsBriefMapper; @Resource private CollectionGoodsService collectionGoodsService; @Override public void startUpdate() { @@ -107,6 +111,8 @@ TaoBaoGoodsBrief updateGoods = getUpdateTaoBaoGoodsBrief(goods); System.out.println("更细信息:" + new Gson().toJson(updateGoods)); taoBaoGoodsBriefMapper.updateByPrimaryKeySelective(updateGoods); // 更新收藏信息 collectionGoodsService.updateCollectionGoods(goods); } }
@@ -14,6 +14,7 @@ import com.yeshi.fanli.entity.admin.ReslutOrder; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil; @@ -38,8 +39,10 @@ String key = "addorder-" + orderId; // redis做频率限制 try { if (Constant.IS_OUTNET) { if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) { continue; } } } catch (Exception e) { @@ -48,6 +51,7 @@ addTaoBaoOrder(orderId, map.get(orderId)); try { // 6小时内不再处理 if (Constant.IS_OUTNET) redisManager.cacheCommonString(key, "1", 60 * 60 * 6); } catch (Exception e) {
@@ -3,6 +3,7 @@ import java.util.List; import com.yeshi.fanli.entity.bus.user.CollectionGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; public interface CollectionGoodsService { /** @@ -30,4 +31,10 @@ void clear(long uid); /** * 更新收藏的商品信息 * @param goods */ void updateCollectionGoods(TaoBaoGoodsBrief goods); } fanli/src/main/java/com/yeshi/fanli/util/HongBaoUtil.java
@@ -156,6 +156,18 @@ TaoBaoOrder taoBaoOrder = validTaoBaoOrderList.get(i); for (int n = 0; n < hongBaoList.size(); n++) { HongBao hongBao = hongBaoList.get(n); if (taoBaoOrder.getOrderState().equalsIgnoreCase("订单结算")) { if (taoBaoOrder.getAuctionId().longValue() == hongBao.getAuctionId() &&( taoBaoOrder.getSettlement().compareTo(hongBao.getPayMoney()) == 0||taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0)) { validHongBaoList.add(hongBao); hongBaoList.remove(n); break; } } else { if (taoBaoOrder.getAuctionId().longValue() == hongBao.getAuctionId() && taoBaoOrder.getPayment().compareTo(hongBao.getPayMoney()) == 0) { validHongBaoList.add(hongBao); @@ -164,6 +176,7 @@ } } } } if (validTaoBaoOrderList.size() != validHongBaoList.size()) { LogHelper.test("淘宝订单与红包数量不对应"); fanli/src/main/java/com/yeshi/fanli/util/ImageUtil.java
@@ -445,10 +445,10 @@ font = font.deriveFont(50.0f); g2d.setFont(font); g2d.setColor(new Color(229, 0, 93)); g2d.drawString("返利券提醒您", 312, 1118 + 40); // g2d.drawString("返利券提醒您", 312, 1118 + 40); g2d.setColor(new Color(102, 102, 102)); g2d.drawString("长按识别二维码领取优惠券", 312, 1118 + 105); g2d.drawString("长按识别二维码领取优惠券", 312, 1118 + 77); g2d.dispose();
@@ -674,8 +674,15 @@ orderItem.setSettlementTime(0L); String createTime = tbo.getCreateTime(); orderItem.setCreateTime(TimeUtil.convertDateToTemp2(createTime)); if ("订单结算".equalsIgnoreCase(tbo.getOrderState())) orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.geteIncome())); else orderItem.setFanMoney(MoneyBigDecimalUtil.mul(rate.divide(BigDecimal.valueOf(100)), tbo.getEstimate())); if ("订单结算".equalsIgnoreCase(tbo.getOrderState())) orderItem.setPayMoney(tbo.getSettlement()); else orderItem.setPayMoney(tbo.getPayment()); orderItem.setOrder(order); orderItem.setOrderId(tbo.getOrderId()); @@ -809,6 +816,9 @@ pidOrder.setOrderType(taoBaoOrder.getOrderType()); pidOrder.setRate(taoBaoOrder.getiRatio()); pidOrder.setPayMoney(taoBaoOrder.getPayment()); if ("订单结算".equalsIgnoreCase(taoBaoOrder.getOrderState())) pidOrder.setPreMoney(taoBaoOrder.geteIncome()); else pidOrder.setPreMoney(taoBaoOrder.getEstimate()); pidOrder.setFinalMoney(taoBaoOrder.getSettlement()); if (!StringUtil.isNullOrEmpty(taoBaoOrder.getSettlementTime()))
