修改移动接口代码

src/main/java/org/springblade/gateway/goods_gateway/controller/AppHelpGoodsController.java

@@ -14,8 +14,11 @@ import org.springblade.sing.point.entity.CmccPointRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+
 /**
  * @Author: Silent
  * @Description
@@ -37,8 +40,13 @@ public class AppHelpGoodsController {
 	@PostMapping("/exchangeProps")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "兑换道具", notes = "传入pointRecord")
-	public R exchangeProps(CmccPointRecord cmccPointRecord, CmccDectOrderRequest cmccDectOrderRequest){
+	public R exchangeProps(@RequestParam Long helpGoodsId,
+						   @RequestParam Long userId,
+						   CmccDectOrderRequest cmccDectOrderRequest){
 		try {
+			CmccPointRecord cmccPointRecord = new CmccPointRecord();
+			cmccPointRecord.setHelpGoodsId(helpGoodsId);
+			cmccPointRecord.setUserId(userId);
 			appHelpGoodsService.exchangeProps(cmccPointRecord,cmccDectOrderRequest);
 			return R.success("兑换成功");
 		} catch (Exception e) {
@@ -53,8 +61,24 @@ public class AppHelpGoodsController {
 	@PostMapping("/createPropsOrder")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "创建道具订单", notes = "传入cmccPointRecord")
-	public R createPropsOrder(CmccPointRecord cmccPointRecord, CmccPlaceOrderRequest cmccPlaceOrderRequest){
+	public R createPropsOrder(@RequestParam Long helpGoodsId,
+							  @RequestParam Long userId,
+							  @RequestParam String phone,
+							  @RequestParam BigDecimal num,
+							  @RequestParam String fingerprint,
+							  @RequestParam String sessionId){
 		try {
+			CmccPlaceOrderRequest cmccPlaceOrderRequest = CmccPlaceOrderRequest
+				.builder()
+				.fingerprint(fingerprint)
+				.sessionId(sessionId)
+				.build();
+
+			CmccPointRecord cmccPointRecord = new CmccPointRecord();
+			cmccPointRecord.setHelpGoodsId(helpGoodsId);
+			cmccPointRecord.setNum(num);
+			cmccPointRecord.setPhone(phone);
+			cmccPointRecord.setUserId(userId);
 			//创建随机单号
 			appHelpGoodsService.createPropsOrder(cmccPointRecord, cmccPlaceOrderRequest);
 			return R.data(cmccPlaceOrderRequest.getOutOrderId());
@@ -70,9 +94,14 @@ public class AppHelpGoodsController {
 	@PostMapping("/sendCmccSms")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "创建道具订单", notes = "传入cmccPlaceOrderRequest")
-	public R sendCmccSms(CmccPlaceOrderRequest cmccPlaceOrderRequest){
+	public R sendCmccSms(@RequestParam String mobile,
+						 @RequestParam String outOrderId){
 		try {
-			//创建随机单号
+			CmccPlaceOrderRequest cmccPlaceOrderRequest = CmccPlaceOrderRequest
+				.builder()
+				.mobile(mobile)
+				.outOrderId(outOrderId)
+				.build();
 			CmccUtil.sendCmccSms(cmccPlaceOrderRequest);
 			return R.data(cmccPlaceOrderRequest.getOutOrderId());
 		} catch (Exception e) {

src/main/java/org/springblade/gateway/goods_gateway/service/impl/AppHelpGoodsServiceImpl.java

@@ -159,10 +159,12 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 
 		//设置状态为待支付
 		cmccPointRecord.setPayStatus(CmccPayStatus.WAIT);
+		//生成随机订单号
 		cmccPointRecord.setOutOrderId(IdUtil.randomUUID());
 
 		//设置请求属性
 		cmccPlaceOrderRequest.setOutOrderId(cmccPointRecord.getOutOrderId());
+		cmccPlaceOrderRequest.setProductId("S9990141_bstSP10001");
 		cmccPlaceOrderRequest.setProductItemList(Arrays.asList("S9990141_bstSP10001"));
 		cmccPlaceOrderRequest.setMobile(cmccPointRecord.getPhone());
 		cmccPlaceOrderRequest.setNum(cmccPointRecord.getNum().toString());

src/main/java/org/springblade/gateway/point_gateway/controller/CmccController.java

@@ -11,6 +11,7 @@ import org.springblade.payment.cmcc.request.CmccRequest;
 import org.springblade.payment.cmcc.util.CmccUtil;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -31,9 +32,12 @@ public class CmccController {
 	 */
 	@PostMapping("/queryCmccPoint")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "查询移动积分", notes = "传入pointRecord")
+	@ApiOperation(value = "查询移动积分", notes = "传入mobile")
 	@SneakyThrows
-	public R queryCmccPoint(CmccRequest cmccRequest){
-		return R.data(CmccUtil.queryCmccBalance(cmccRequest));
+	public R queryCmccPoint(@RequestParam String mobile){
+		return R.data(CmccUtil.queryCmccBalance(CmccRequest
+			.builder()
+			.mobile(mobile)
+			.build()));
 	}
 }

src/main/java/org/springblade/payment/cmcc/util/CmccUtil.java

@@ -193,13 +193,11 @@ public class CmccUtil {
 			//添加参数，进行签名
 			.body(JSONObject.toJSONString(sign(checkParam(cmccRequest, callback)))).execute();
 		log.info("CMCC-请求响应内容:{}",httpResponse.body());
-		CmccResponse cmccResponse = JSONObject.parseObject(httpResponse.body()).toJavaObject(CmccResponse.class);
+		CmccResponse cmccResponse = JSONObject.parseObject(httpResponse.body(), CmccResponse.class);
 		//判断状态是否成功
-		if (!StringUtils.equals(cmccResponse.getResultCode(), CmccResponseStatus.SUCCESS.name())) {
-			//判断是否有回调
-			if(!callback || !StringUtils.equals(cmccResponse.getResultCode(),CmccResponseStatus.AUTH.name())){
-				throw new CmccRequestException(cmccResponse.getMessage());
-			}
+		if (!StringUtils.equals(cmccResponse.getResultCode(), CmccResponseStatus.SUCCESS.getCode())
+			&& (!callback || !StringUtils.equals(cmccResponse.getResultCode(),CmccResponseStatus.AUTH.getCode()))) {
+			throw new CmccRequestException(cmccResponse.getMessage());
 		}
 		return cmccResponse;
 	}