|
@@ -9,8 +9,14 @@ import com.miaxis.common.constant.Constants;
|
|
|
import com.miaxis.common.core.controller.BaseController;
|
|
|
import com.miaxis.common.core.domain.Response;
|
|
|
import com.miaxis.common.core.domain.entity.SysDictData;
|
|
|
+import com.miaxis.common.core.domain.entity.UserInfo;
|
|
|
import com.miaxis.common.exception.CustomException;
|
|
|
import com.miaxis.common.utils.IosVerifyUtil;
|
|
|
+import com.miaxis.common.utils.SecurityUtils;
|
|
|
+import com.miaxis.common.utils.uuid.UUID;
|
|
|
+import com.miaxis.newgzpt.domain.GzptUserInfo;
|
|
|
+import com.miaxis.newgzpt.dto.GzptAppleInfoDTO;
|
|
|
+import com.miaxis.newgzpt.service.IGzptUserInfoService;
|
|
|
import com.miaxis.order.service.IOrderInfoService;
|
|
|
import com.miaxis.system.service.ISysDictDataService;
|
|
|
import io.swagger.annotations.Api;
|
|
@@ -18,13 +24,13 @@ import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.security.core.parameters.P;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
+import java.util.Random;
|
|
|
|
|
|
/**
|
|
|
* 【小程序-微信支付】Controller
|
|
@@ -51,6 +57,10 @@ public class ApplePayController extends BaseController {
|
|
|
|
|
|
@Autowired
|
|
|
private ISysDictDataService dictDataService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IGzptUserInfoService userInfoService;
|
|
|
+
|
|
|
/**
|
|
|
* TransactionID:苹果配置的产品id
|
|
|
* String receipt_data:需要客户端传过来的参数2
|
|
@@ -119,6 +129,44 @@ public class ApplePayController extends BaseController {
|
|
|
}
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
+ * 根据用户帐号获取
|
|
|
+ */
|
|
|
+ @GetMapping("/getAppleUserInfo")
|
|
|
+ @ApiOperation("获取学员详细信息")
|
|
|
+ public Response<GzptUserInfo> getAppleUserInfo(GzptAppleInfoDTO appleInfoDTO) {
|
|
|
+
|
|
|
+ GzptUserInfo userInfo = userInfoService.getAppleUserInfo(appleInfoDTO);
|
|
|
+
|
|
|
+ if(userInfo==null) { //不存在用户
|
|
|
+ userInfo = new GzptUserInfo();
|
|
|
+ String userName = "游客"+System.currentTimeMillis()/100;
|
|
|
+ userInfo.setUserName(userName);
|
|
|
+ userInfo.setSex("1");
|
|
|
+ userInfo.setLogincode(appleInfoDTO.getLogincode());
|
|
|
+ userInfo.setCartype("C1");
|
|
|
+ userInfo.setPassword("e10adc3949ba59abbe56e057f20f883e");
|
|
|
+ userInfo.setPhoto("https://t1-1305573081.file.myqcloud.com/jsjp/head/tourist.png");
|
|
|
+ userInfo.setNickname(userName);
|
|
|
+ userInfo.setCrdate(new Date());
|
|
|
+ userInfo.setPxjd(1);
|
|
|
+ userInfo.setMnStatus(0);
|
|
|
+ userInfo.setEduStatus(0);
|
|
|
+ Long id = userInfoService.saveGzptUserInfo(userInfo);
|
|
|
+ if(id!=null) {
|
|
|
+ userInfo.setId(id);
|
|
|
+ return Response.success(userInfo);
|
|
|
+ } else {
|
|
|
+ Response response = new Response(200,"新增失败");
|
|
|
+ return response;
|
|
|
+ }
|
|
|
+ } else { //存在用户
|
|
|
+ return Response.success(userInfo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
public static void main(String[] args) {
|
|
|
|
|
|
String str = "com.kestrel.JSJPStudent.vip.212";
|