فهرست منبع

fix 默认头像

zoujiajian 3 سال پیش
والد
کامیت
44bd897867

+ 0 - 5
netflix-dao/src/main/java/com/cyksj/model/request/LoginPhoneReq.java

@@ -18,9 +18,4 @@ public class LoginPhoneReq {
 	 * 验证码
 	 */
 	private String code;
-
-	/**
-	 * 跳转url
-	 */
-	private String redirectUrl;
 }

+ 3 - 1
netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -449,6 +449,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 		orderDon.setStatus(OrderDon.Status.noPayment);
 		orderDon.setUserId(user.getId());
+		orderDon.setGoodsId(goodsDon.getId());
 		this.saveOrUpdate(orderDon);
 
 		jobManager.addJob(EXPIRY_TIME, () -> {
@@ -616,7 +617,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		String body = Codec.DoBase64.custom()
 				.setData(Jsons.toJson(attach)).encodeAsText();
 		OrderDon orderDon = orderDonMapper.selectById(orderId);
-		GoodsDon goodsDon = goodsDonMapper.selectById(orderDon.getGoodsId());
+		GoodsDonSku goodsDonSku = goodsDonSkuMapper.selectById(orderDon.getSkuId());
+		GoodsDon goodsDon = goodsDonMapper.selectById(goodsDonSku.getGoodsId());
 		if (ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode)) {
 			//手机网站支付
 			AlipayTradeWapPayRequest alipayTradeWapPayRequest = new AlipayTradeWapPayRequest();

+ 1 - 1
netflix-service/src/main/java/com/cyksj/task/Scheduler.java

@@ -95,7 +95,7 @@ public class Scheduler {
                             .setToUser(customerService.getOpenId())
                             .setTemplateId(EXPIRY_TEMPLATE)
                             .setUrl(" ");
-                    WxMpTemplateMessage.TemplateData data2 = templateMessage.getData();
+                    WxMpTemplateMessage.TemplateData data2 = manageMessage.getData();
                     data2.setFirst(new WxMpTemplateData("您有" + accounts.size() + "个主账号即将到期"));
                     data2.setKeyword1(new WxMpTemplateData("车队主账号"));
                     data2.setKeyword2(new WxMpTemplateData("车队主账号"));

+ 2 - 0
netflix-web/src/main/java/com/cyksj/web/controller/user/AuthorizationController.java

@@ -313,6 +313,8 @@ public class AuthorizationController {
             user = new User();
             user.setLoginPhone(loginPhoneReq.getPhone());
             user.setNickname(String.format("银河用户%s", Codec.DoDigest.custom().setAlgorithm(Codec.DoDigest.Algorithm.MD5).setStringData(String.format("%s%s", user.getId(), user.getLoginPhone())).toHexString().substring(0, 6)));
+            //默认头像
+            user.setHeadimgurl("https://cdn.sxfoundation.com/picture/f6ee11101c4f5f0bc48d88aca7a5dbfd-1666945673391.png");
             userService.save(user);
         }
         //写回登陆信息