Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/controller/wxapi/basic/WechatPayController.java

@@ -13,8 +13,12 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -64,6 +68,10 @@ public class WechatPayController {
         log.info("parseOrderNotifyResult--0" + appId + "---" + xmlData);
         WxPayService wxPayService = wechatPayService.getWxPayService();
         final WxPayOrderNotifyResult notifyResult = wxPayService.parseOrderNotifyResult(xmlData);
+
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        RequestContextHolder.setRequestAttributes(attributes,true);
+
         // 另起线程处理业务
         executorService.execute(new Runnable() {
             @Override

src/main/resources/mapper/TradeMapper.xml

@@ -188,7 +188,9 @@
     <update id="updateById">
         update dkic_a.t_cp_trade
         set wx_trade_no  = #{wxTradeNo},
-            integral_share_id  = #{integralShareId},
+            <if test="integralShareId != null">
+                integral_share_id = #{integralShareId}::uuid,
+            </if>
             trade_status = #{tradeStatus}
         where trade_id = #{tradeId}
     </update>