循环依赖

src/main/java/com/gogirl/application/user/customer/impl/CustomerBalanceServiceImpl.java

@@ -12,16 +12,15 @@ import com.gogirl.domain.store.store.StoreUser;
 import com.gogirl.domain.user.customer.CustomerBalance;
 import com.gogirl.domain.user.customer.CustomerBalanceRecord;
 import com.gogirl.infrastructure.common.exception.RRException;
-import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.store.store.UserManageMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceMapper;
 import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceRecordMapper;
 import com.gogirl.shared.user.command.ConsumerCommand;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -29,15 +28,21 @@ import java.util.List;
 import java.util.Map;
 
 @Service
-@AllArgsConstructor
 @Slf4j
 @Transactional
 public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMapper, CustomerBalance> implements CustomerBalanceService {
 
-    private final CustomerBalanceMapper customerBalanceMapper;
-    private final CustomerBalanceRecordMapper balanceRecordDao;
-    private final OrderManageMapper orderManageMapper;
-    private final CustomerBalanceRecordMapper customerBalanceRecordMapper;
+    @Resource
+    private CustomerBalanceMapper customerBalanceMapper;
+    @Resource
+    private CustomerBalanceRecordMapper balanceRecordDao;
+    @Resource
+    private CustomerBalanceRecordMapper customerBalanceRecordMapper;
+
+    @Resource
+    private UserManageMapper userManageMapper;
+    @Resource
+    private OrderManageService orderManageService;
 
     @Override
     public CustomerBalance getCustomerBalance(int customerId) {
@@ -51,7 +56,6 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
         return customerBalance;
     }
 
-
     @Override
     public void consumer(ConsumerCommand cmd) {
         CustomerBalance customerBalance = customerBalanceMapper.selectOne(new LambdaQueryWrapper<CustomerBalance>()
@@ -91,8 +95,6 @@ public class CustomerBalanceServiceImpl extends ServiceImpl<CustomerBalanceMappe
         customerBalanceMapper.updateById(customerBalance);
     }
 
-    private final UserManageMapper userManageMapper;
-    private final OrderManageService orderManageService;
 
     @Override
     public PageInfo<CustomerBalanceRecord> getBalanceRecordCard(Integer customerId, int pageNum, int pageSize) {

src/main/java/com/gogirl/domain/product/ColorSystemType.java

-package com.gogirl.domain.product;
-
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author robbendev
- * @since 2020-03-11
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="ColorSystemType对象", description="")
-public class ColorSystemType implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private String name;
-
-
-}

src/main/java/com/gogirl/domain/product/serve/ColorSystemType.java

 package com.gogirl.domain.product.serve;
 
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author robbendev
@@ -18,11 +20,14 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ColorSystemType对象", description="")
+@ApiModel(value = "ColorSystemType对象", description = "")
 public class ColorSystemType implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
     private String name;
 
 

src/main/resources/application-dev.yml

@@ -74,10 +74,14 @@ gogirl:
   #服务器图片临时地址
   picture-path: /upload/grouppic/
 
+  #门店下班时间
   end-time: "22:00:00"
+  #门店上班时间
   start-time: "10:00:00"
   #评论延迟时间
   test-paper-time: 1440
+  #后台后端接口访问地址
+  admin-backend-url: http://test.admin.begogirls.com:7712
 
 wx:
   pay:

src/main/resources/application-prod.yml

@@ -74,13 +74,14 @@ gogirl:
   #服务器图片临时地址
   picture-path: /upload/grouppic/
 
+  #门店下班时间
   end-time: "22:00:00"
+  #门店上班时间
   start-time: "10:00:00"
   #评论延迟时间
   test-paper-time: 1440
-
   #后台后端接口访问地址
-  admin-backend-url: http://admin.begogirls.com:7712
+  admin-backend-url: http://test.admin.begogirls.com:7712
 
 wx:
   pay:

src/main/resources/application-test.yml

@@ -74,10 +74,14 @@ gogirl:
   #服务器图片临时地址
   picture-path: /upload/grouppic/
 
+  #门店下班时间
   end-time: "22:00:00"
+  #门店上班时间
   start-time: "10:00:00"
   #评论延迟时间
   test-paper-time: 1440
+  #后台后端接口访问地址
+  admin-backend-url: http://test.admin.begogirls.com:7712
 
 wx:
   pay: