fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -95,7 +95,7 @@ TaoBaoLink taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId); JSONObject data = new JSONObject(); String url = String.format("http://%s%s?uid=%s&id=%s", configService.getH5Host(), String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq", configService.getH5Host(), Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY), auctionId + "");
@@ -175,7 +175,7 @@ if (list.size() <= 0) return; List<TaoBaoOrder> orderList = taoBaoOrderMapper.selectTaoBaoOrderByOrderId(orderId); if (orderList == null || orderList.size() != list.size()) { if (orderList == null || orderList.size() < list.size()) { System.out.println("红包数与订单数不对应"); return; } @@ -220,7 +220,7 @@ commonOrder.setCommonOrderGoods(goods); commonOrder.setUserInfo(list.get(i).getUserInfo()); commonOrder.setCreateTime(new Date(list.get(i).getCreatetime())); commonOrderMapper.insertSelective(commonOrder); // 插入红包 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
@@ -2,6 +2,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -16,6 +17,7 @@ import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper; import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper; import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper; import com.yeshi.fanli.dao.mybatis.goods.CommonGoodsMapper; import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper; import com.yeshi.fanli.dao.mybatis.order.OrderMapper; import com.yeshi.fanli.dao.order.OrderItemDao; @@ -24,6 +26,7 @@ import com.yeshi.fanli.entity.bus.user.OrderItem; import com.yeshi.fanli.entity.bus.user.ThreeSaleGift; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.goods.CommonGoods; import com.yeshi.fanli.entity.taobao.TaoBaoOrder; import com.yeshi.fanli.exception.OrderItemException; import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService; @@ -94,6 +97,9 @@ @Resource private RedisManager redisManager; @Resource private CommonGoodsMapper commonGoodsMapper; @Transactional(propagation = Propagation.REQUIRES_NEW) public void saveOrUpdate(List<OrderItem> list) { @@ -406,9 +412,18 @@ @Transactional @Override public OrderItem addOrderItem(TaoBaoOrder taoBaoOrder, Order order, BigDecimal rate) throws OrderItemException { //如果下架则从CommonGoods里面获取图片 List<String> imgList=redisManager.getTBImg(taoBaoOrder.getAuctionId()); if(imgList.size()==0) {imgList=new ArrayList<>(); CommonGoods commonGoods= commonGoodsMapper.selectByGoodsIdAndGoodsType(taoBaoOrder.getAuctionId(), CommonGoods.GOODS_TYPE_TB); if(commonGoods!=null) imgList.add(commonGoods.getPicture()); } OrderItem orderItem = TaoBaoOrderUtil.convert(taoBaoOrder, order, rate, redisManager.getTBImg(taoBaoOrder.getAuctionId())); imgList); orderItem.setFanTime(0L); orderItem.setIsGift(false); fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java
@@ -70,10 +70,6 @@ taoBaoOrderMapper.insertSelective(taoBaoOrder); } } else { //测试 if(1>0) return; boolean hasPayOrder = false; for (TaoBaoOrder order : oldOrderList) if (order.getOrderState().equalsIgnoreCase("订单付款")) { fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
@@ -408,6 +408,7 @@ detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractReject.name() + ":" + extract.getId())); detail.setMoney(extract.getMoney()); detail.setSourceIdentifyId(extract.getId()); detail.setSubTitle("原路退回"); detail.setTitle(UserMoneyDetailTypeEnum.extractReject.getDesc()); detail.setType(UserMoneyDetailTypeEnum.extractReject); detail.setUpdateTime(new Date()); fanli/src/main/java/com/yeshi/fanli/util/wx/WXInterceptorUtil.java
New file @@ -0,0 +1,54 @@ package com.yeshi.fanli.util.wx; import java.util.HashMap; import java.util.Map; import org.yeshi.utils.HttpUtil; import net.sf.json.JSONObject; /** * 微信域名拦截 * @author Administrator * */ public class WXInterceptorUtil { public static final int STATUS_NORMAL=1;//正常 public static final int STATUS_INTERCEPTOR=0;//被拦截 public static final int STATUS_UNKNOWN_=2;//检测失败 /** * 微信域名检测 * @return */ public static int getDomainStatus(String domain) { Map<String,String> params=new HashMap<>(); params.put("domain",domain); Map<String,String> headers=new HashMap<>(); headers.put("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36"); headers.put("X-Requested-With","XMLHttpRequest"); headers.put("Referer","http://www.yumingjiance.net/index.php?s=/weixin/index/cate/weixinjiance.html"); String result= HttpUtil.post("http://www.yumingjiance.net/index.php?s=/Index/ck_weixin", params,headers); JSONObject resultJson= JSONObject.fromObject(result); if(resultJson.optInt("status")==1) return STATUS_NORMAL; else if(resultJson.optInt("status")==0) return STATUS_INTERCEPTOR; else return STATUS_UNKNOWN_; } }
