fanli-server.git

			@@ -90,6 +90,8 @@
			// out.close();
			// return null;
			// }
			//uid


			Object obj = null;
			try {

			@@ -10,6 +10,8 @@
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;

			import com.yeshi.fanli.entity.bus.user.LostOrder;
			import com.yeshi.fanli.entity.bus.user.Order;
			import com.yeshi.fanli.entity.taobao.PidUser;
			import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
			import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
			@@ -78,6 +80,9 @@

			@Resource
			private LostOrderService lostOrderService;

			@Resource
			private OrderService orderService;

			private void updateOrder(long startTime, long endTime) {
			List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
			@@ -169,8 +174,20 @@
			// 移除会员运营ID与渠道专属订单
			if (orderList.get(i).getAdPositionName().contains("会员运营")
			\|\| orderList.get(i).getAdPositionName().contains("渠道专属")) {
			if (orderList.get(i).getAdPositionName().contains("会员运营")) {// 处理订单申诉
			Order order = orderService.findOrderByOrderIdAndType(orderList.get(i).getOrderId(),
			Order.ORDER_TYPE_TAOBAO);
			if (order != null && order.getBeizhu().contains("补单")) {// 不排除补单的情况

			} else {
			orderList.remove(i);
			i--;
			break;
			}
			} else {
			orderList.remove(i);
			i--;
			}
			}
			}

			@@ -514,7 +514,6 @@
			BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
			// 免单处理
			boolean mianDan = false;
			if (commonOrder.getState() == CommonOrder.STATE_JS \|\| commonOrder.getState() == CommonOrder.STATE_FK) {
			List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
			commonOrder.getOrderNo());
			if (orderList != null && orderList.size() == 1) {// 只有1个订单才参与免单
			@@ -524,8 +523,6 @@

			if (payMent.compareTo(new BigDecimal(10)) < 0) {
			mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getOrderNo());
			fanliRate = new BigDecimal(100);
			}
			}
			}

			@@ -536,14 +533,27 @@
			hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
			hongBao.setMoney(
			MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
			if (mianDan)
			hongBao.setMoney(commonOrder.getPayment());
			} else if (commonOrder.getState() == CommonOrder.STATE_JS) {
			hongBao.setState(HongBaoV2.STATE_KELINGQU);
			hongBao.setMoney(
			MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
			hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));
			if (mianDan)
			hongBao.setMoney(commonOrder.getSettlement().compareTo(commonOrder.getPayment()) <= 0
			? commonOrder.getSettlement() : commonOrder.getPayment());//返利结算与付款较小的金额
			} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
			hongBao.setState(HongBaoV2.STATE_SHIXIAO);
			hongBao.setMoney(new BigDecimal(0));
			if (mianDan) {
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			} catch (Exception e) {
			e.printStackTrace();
			throw new HongBaoException(12, "免单券退款出错");
			}
			}
			}
			hongBaoV2Mapper.updateByPrimaryKeySelective(hongBao);

	fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史