提交 0049994e authored 作者: Whispa's avatar Whispa

commit

上级 f6fcf31f
...@@ -294,10 +294,10 @@ public class OrderController extends Controller { ...@@ -294,10 +294,10 @@ public class OrderController extends Controller {
System.out.println(orderId); System.out.println(orderId);
repository.save(order); repository.save(order);
return new Result();
} }
return new Result(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(), ""); return new Result(ResultCodeEnum.ILLEGAL_ARGUMENT.getCode(), "Order not found");
} }
......
...@@ -3,6 +3,7 @@ package com.example.afrishop_v3.models; ...@@ -3,6 +3,7 @@ package com.example.afrishop_v3.models;
import com.example.afrishop_v3.base.StateConstant; import com.example.afrishop_v3.base.StateConstant;
import com.example.afrishop_v3.enums.OrderStatusEnum; import com.example.afrishop_v3.enums.OrderStatusEnum;
import com.example.afrishop_v3.util.IdUtil; import com.example.afrishop_v3.util.IdUtil;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
...@@ -73,10 +74,11 @@ public class TbCfItemOrderR { ...@@ -73,10 +74,11 @@ public class TbCfItemOrderR {
@ManyToOne
@JsonIgnore @ManyToOne
private TbCfExpressTemplate template; private TbCfExpressTemplate template;
@Transient @Transient @JsonIgnore
private String cartRecordId; private String cartRecordId;
TbCfItemOrderR(String id,String orderId,String itemId,Integer itemNum,BigDecimal itemPrice,TbCfExpressTemplate template,String itemImg,String itemSku,String itemTitle,String shopId,String shopName,String shopUrl){ TbCfItemOrderR(String id,String orderId,String itemId,Integer itemNum,BigDecimal itemPrice,TbCfExpressTemplate template,String itemImg,String itemSku,String itemTitle,String shopId,String shopName,String shopUrl){
......
...@@ -15,6 +15,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur ...@@ -15,6 +15,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.config.http.SessionCreationPolicy;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
...@@ -42,6 +43,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -42,6 +43,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
authenticationManagerBuilder.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder()); authenticationManagerBuilder.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
} }
@Bean @Bean
@Override @Override
public AuthenticationManager authenticationManagerBean() throws Exception { public AuthenticationManager authenticationManagerBean() throws Exception {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论