Merge branch 'master-chw-bug' into dev-chw

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -7,6 +7,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
@@ -17,6 +18,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -83,7 +85,6 @@ import java.util.stream.Collectors;
 import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.*;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
-import static com.xxfc.platform.order.entity.OrderPersonInsurance.STATUS_PAY;
 import static com.xxfc.platform.order.pojo.mq.OrderMQDTO.*;
 import static com.xxfc.platform.universal.constant.DictionaryKey.ILLEGAL_TYPE;
 
@@ -885,6 +886,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 					//处理后台用户提醒短信的发送
 //                orderMsgBiz.handelBgUserMsg4Pay(orvd, baseOrder, appUserDTO, OrderMsgBiz.RENT_PAY);
 					sendOrderMq(orvd, otd, omd, baseOrder, ORDER_PAY);
+					JSONObject jsonObject = new JSONObject();
+					jsonObject.put("integralRuleCode", "RENTRV");
+					jsonObject.put("amount", baseOrder.getGoodsAmount());
+					mqSenderFeign.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
+
 					if (OrderTypeEnum.MEMBER.getCode().equals(baseOrder.getType())) {
 						sendOrderMq(orvd, otd, omd, baseOrder, ORDER_FINISH);
 						//订单完成时，payway为 支付宝，则转支付

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -11,7 +11,6 @@ import com.alipay.api.internal.util.AlipaySignature;
 import com.alipay.api.request.*;
 import com.alipay.api.response.*;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
-import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.HTTPSUtils;
@@ -21,14 +20,15 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.util.process.SystemConfig;
 import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.universal.constant.PayWay;
+import com.xxfc.platform.universal.constant.WxResponseProperties;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.entity.OrderPay;
 import com.xxfc.platform.universal.mapper.OrderPayMapper;
 import com.xxfc.platform.universal.utils.SignUtils;
 import com.xxfc.platform.universal.vo.FundPayVo;
 import com.xxfc.platform.universal.vo.OrderPayVo;
-import com.xxfc.platform.universal.weixin.api.*;
-import com.xxfc.platform.universal.constant.WxResponseProperties;
+import com.xxfc.platform.universal.weixin.api.WXPay;
+import com.xxfc.platform.universal.weixin.api.WXSuppToUserPay;
 import com.xxfc.platform.universal.weixin.util.HTTPUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
@@ -40,7 +40,10 @@ import tk.mybatis.mapper.entity.Example;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import static com.xxfc.platform.universal.constant.DictionaryKey.PAY_DEMOTION;
 import static com.xxfc.platform.universal.constant.DictionaryKey.UNIVERSAL_PAY;
@@ -183,8 +186,6 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
                     jsonObject.put("integralRuleCode", "BUYMEMBER");
                 }
                 log.info("支付订单号：orderNo = {}, orderType = {}", newValue.getOrderNo(), newValue.getChannel());
-                log.info("支付成功获取积分：发送消息 exchange = {}, routingKey = {}, json = {}", RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
-                mqServiceBiZ.sendMessage(RabbitConstant.INTEGRAL_TOPIC, RabbitConstant.INTEGRAL_ROUTING_KEY, jsonObject.toJSONString());
             }
             if (StringUtils.isNotBlank(pay.getNotifyUrl())) {
                 String url = pay.getNotifyUrl();