diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/yuan-modules/yuan-purchaseorder/src/main/resources/mapper/PurchaseOrderMapper.xml b/yuan-modules/yuan-purchaseorder/src/main/resources/mapper/PurchaseOrderMapper.xml index 5893f81..22f6d49 100644 --- a/yuan-modules/yuan-purchaseorder/src/main/resources/mapper/PurchaseOrderMapper.xml +++ b/yuan-modules/yuan-purchaseorder/src/main/resources/mapper/PurchaseOrderMapper.xml @@ -2,7 +2,7 @@ - INSERT INTO `t_purchase_order` (`volume_code_id`, `userId`, `purchase_quantity`, `purchase_price`, `purchase_create_time`, `purchase_order_status`) + INSERT INTO `t_purchase_order` (`volume_code_id`, `user_id`, `purchase_quantity`, `purchase_price`, `purchase_create_time`, `purchase_order_status`) VALUES (#{volumeCodeId}, #{userId}, #{purchaseQuantity}, #{purchasePrice}, now(), 0); diff --git a/yuan-modules/yuan-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java b/yuan-modules/yuan-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java index f0e6343..3e394bb 100644 --- a/yuan-modules/yuan-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java +++ b/yuan-modules/yuan-user/src/main/java/com/bwie/user/service/impl/UserServiceImpl.java @@ -39,7 +39,7 @@ public class UserServiceImpl implements UserService { */ @Override public void save(User user) { - if (user.getName().isEmpty()){ + if (user.getName() == null && user.getName() == ""){ String str = "VOLUME_CODE用户:"+new Random().nextInt(1000000); user.setName(str); }