Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.base.Joiner;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
@@ -271,9 +272,10 @@ public class KylinRefundsStatusServiceImpl {
                         }
                     }
                 }
-                // 退积分
-                feignStoneIntegralClient.de2111(orderInfo.getUserId(), refundCallbackParam.getRefundPrice().setScale(0, BigDecimal.ROUND_HALF_UP).intValue(), "演出订单退款:".concat(orderInfo.getPerformanceTitle()).concat(":").concat(orderInfo.getOrderCode().substring(orderInfo.getOrderCode().length() - 10)));
             }
+            // 退积分
+            ResponseDto<String> de2111 = feignStoneIntegralClient.de2111(orderInfo.getUserId(), refundCallbackParam.getRefundPrice().setScale(0, BigDecimal.ROUND_HALF_UP).intValue(), "演出订单退款:".concat(orderInfo.getPerformanceTitle()).concat(":").concat(orderInfo.getOrderCode().substring(orderInfo.getOrderCode().length() - 10)));
+            log.info("订单退款回调退积分结果：[de2111={}]", de2111);
         }
 
         return true;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatLoginController.java

@@ -4,16 +4,14 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.vo.WechatTokenInfoVo;
 import com.liquidnet.service.sweet.dto.vo.WechatUserInfoVo;
 import com.liquidnet.service.sweet.service.impl.SweetWechatLoginServiceImpl;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "小程序-公众号登陆相关")
 @RestController
@@ -81,4 +79,14 @@ public class SweetWechatLoginController {
         return sweetLoginService.mpUserInfo(code, type);
     }
 
+    @PostMapping("applyUser")
+    @ApiOperation("用unionId或者手机号等相关信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", dataType = "String", name = "unionId", value = "微信unionId", required = true)
+    })
+    public ResponseDto<SweetAppletUsersVo> getApplyUser(@RequestParam() String unionId) {
+        SweetAppletUsersVo sweetAppletUsers = sweetLoginService.getApplyUser(unionId);
+        return ResponseDto.success(sweetAppletUsers);
+    }
+
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -162,4 +162,7 @@ public class SweetWechatLoginServiceImpl {
         }
     }
 
+    public SweetAppletUsersVo getApplyUser(String unionId) {
+        return redisUtils.getSweetAppletUsersOfUnionId(unionId);
+    }
 }