to autowired

src/main/java/com/gogirl/application/market/impl/CouponCustomerRelevanceServiceImpl.java

@@ -16,26 +16,29 @@ import com.gogirl.infrastructure.mapper.market.coupon.CouponMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
 import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
 import com.gogirl.shared.market.command.SetUpOuterCouponCommand;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
-@AllArgsConstructor
 @Slf4j
 public class CouponCustomerRelevanceServiceImpl extends ServiceImpl<CouponCustomerRelevanceMapper, CouponCustomerRelevance> implements CouponCustomerRelevanceService {
 
-    private final OrderServeMapper orderServeMapper;
-    private final OrderManageMapper orderManageMapper;
-    private final CouponCustomerRelevanceMapper couponCustomerRelevanceMapper;
-    private final CouponMapper couponMapper;
-    private final MarketService marketService;
-
+    @Resource
+    private OrderServeMapper orderServeMapper;
+    @Resource
+    private OrderManageMapper orderManageMapper;
+    @Resource
+    private CouponCustomerRelevanceMapper couponCustomerRelevanceMapper;
+    @Resource
+    private CouponMapper couponMapper;
+    @Resource
+    private MarketService marketService;
 
     @Override
     public List<CouponCustomerRelevance> getOrderCoupon(Integer currentCustomerId, Integer orderId) {

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -50,48 +50,69 @@ import com.gogirl.shared.member.order.command.OrderCommentCommand;
 import com.gogirl.shared.order.serve.query.qry.ordermanage.ListOrderQuery;
 import com.gogirl.shared.user.command.ConsumerCommand;
 import com.google.common.collect.Lists;
-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.*;
 import java.util.stream.Collectors;
 
 @Service
-@AllArgsConstructor
 @Transactional
 @Slf4j
 public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, OrderManage> implements OrderManageService {
 
-    private final OrderManageMapper orderManageMapper;
-    private final OrderServeMapper orderServeMapper;
-    private final BaseServeMapper baseServeMapper;
-    private final BaseTypeMapper baseTypeMapper;
-    private final BaseProduceMapper baseProduceMapper;
-    private final ScheduleManageMapper scheduleManageMapper;
-    private final CouponCustomerRelevanceService couponCustomerRelevanceService;
-    private final StoreTechnicianMapper storeTechnicianMapper;
-    private final TimesCardUsedRecordService timesCardUsedRecordService;
-    private final OrderServeDescribeMapper orderServeDescribeMapper;
-    private final PurchaseSkuMapper purchaseSkuMapper;
-    private final OrderServeSkuMapper orderServeSkuMapper;
-    private final OrderCommentMapper orderCommentMapper;
-    private final OrderCommentLabelMapper orderCommentLabelMapper;
-
-    private final OrderRecordMapper orderRecordMapper;
-
-
-    private final OrderRecordService orderRecordService;
-
-
-    private final OrderServeSkuService orderServeSkuService;
-    private final OrderServeDescribeRelevanceMapper orderServeDescribeRelevanceMapper;
-    private final CustomerService customerService;
-    private final SubscribeService subscribeService;
-    private final GogirlTokenService gogirlTokenService;
-    private final MarketService marketService;
+    @Resource
+    private OrderManageMapper orderManageMapper;
+    @Resource
+    private OrderServeMapper orderServeMapper;
+    @Resource
+    private BaseServeMapper baseServeMapper;
+    @Resource
+    private BaseTypeMapper baseTypeMapper;
+    @Resource
+    private BaseProduceMapper baseProduceMapper;
+    @Resource
+    private ScheduleManageMapper scheduleManageMapper;
+    @Resource
+    private CouponCustomerRelevanceService couponCustomerRelevanceService;
+    @Resource
+    private StoreTechnicianMapper storeTechnicianMapper;
+    @Resource
+    private TimesCardUsedRecordService timesCardUsedRecordService;
+    @Resource
+    private OrderServeDescribeMapper orderServeDescribeMapper;
+    @Resource
+    private PurchaseSkuMapper purchaseSkuMapper;
+    @Resource
+    private OrderServeSkuMapper orderServeSkuMapper;
+    @Resource
+    private OrderCommentMapper orderCommentMapper;
+    @Resource
+    private OrderCommentLabelMapper orderCommentLabelMapper;
+
+    @Resource
+    private OrderRecordMapper orderRecordMapper;
+
+
+    @Resource
+    private OrderRecordService orderRecordService;
+
+
+    @Resource
+    private OrderServeSkuService orderServeSkuService;
+    @Resource
+    private OrderServeDescribeRelevanceMapper orderServeDescribeRelevanceMapper;
+    @Resource
+    private CustomerService customerService;
+    @Resource
+    private SubscribeService subscribeService;
+    @Resource
+    private GogirlTokenService gogirlTokenService;
+    @Resource
+    private MarketService marketService;
 
 
     @Override
@@ -442,7 +463,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
     }
 
-    private final CouponService couponService;
+    @Resource
+    private CouponService couponService;
 
     @Override
     public void recordOrderData(Integer orderId, String remark, String userFeedback, String picturePath, String afterSaleIsBuyCard, String afterSaleBuyCardReason) {
@@ -544,7 +566,8 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         return map;
     }
 
-    private final ScheduleServeMapper scheduleServeMapper;
+    @Resource
+    private ScheduleServeMapper scheduleServeMapper;
 
     @Override
     public List<OrderServe> addOrModifyOrderComment(CreateCommentCommand cmd) {
@@ -739,8 +762,10 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
     }
 
-    private final CustomerBalanceMapper customerBalanceMapper;
-    private final CustomerBalanceService customerBalanceService;
+    @Resource
+    private CustomerBalanceMapper customerBalanceMapper;
+    @Resource
+    private CustomerBalanceService customerBalanceService;
 
     @Override
     public void notifyBalanceWxPayOrder(WxPayOrderNotifyResult result) {
@@ -839,14 +864,15 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
     }
 
-    private final CustomerMessageMapper customerMessageMapper;
+    @Resource
+    private CustomerMessageMapper customerMessageMapper;
 
     @Override
     public void friendPayOrder(Integer orderId, String phone) {
 
         Integer currentCustomerId = SessionUtils.getCustomerToken().getCustomerId();
         Customer customer = customerService.selectByPhone(phone);
-        
+
         if (customer == null) {
             throw new RRException(500, "用户不存在");
         }

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

@@ -40,22 +40,56 @@ import com.gogirl.infrastructure.util.WXCore;
 import com.gogirl.infrastructure.util.lock.Openid1Lock;
 import com.gogirl.shared.member.wx.query.dto.Code2SessionResult;
 import com.google.common.collect.Lists;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.security.InvalidAlgorithmParameterException;
 import java.util.Date;
 import java.util.List;
 
 @Service
-@AllArgsConstructor
 @Slf4j
 public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> implements CustomerService {
 
-    private final CustomerMapper customerMapper;
-    private final WechatService wechatService;
+    @Resource
+    private CustomerMapper customerMapper;
+    @Resource
+    private WechatService wechatService;
+    @Resource
+    private GogirlTokenService gogirlTokenService;
+    @Resource
+    private ScheduleManageMapper scheduleManageMapper;
+
+    @Resource
+    private CustomerDetailMapper customerDetailMapper;
+    @Resource
+    private CustomerBalanceMapper customerBalanceMapper;
+
+    @Resource
+    private QRCodeService qrCodeService;
+
+
+    @Resource
+    private StoreManageMapper storeManageMapper;
+    @Resource
+    private OrderManageMapper orderManageMapper;
+
+    @Resource
+    private OrderServeMapper orderServeMapper;
+    @Resource
+    private BaseServeMapper baseServeMapper;
+    @Resource
+    private OrderRecordMapper orderRecordMapper;
+
+    @Resource
+    private CustomerDetailService customerDetailService;
+    @Resource
+    private OrderManageService orderManageService;
+
+    @Resource
+    private GogirlConfigMapper gogirlConfigMapper;
 
     @Override
     public Customer selectByPhone(String phone) {
@@ -169,8 +203,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         customerMapper.updateById(customer);
     }
 
-    private final GogirlTokenService gogirlTokenService;
-
     @Override
     public Customer authorized1(String token, String encryptedData, String iv) throws InvalidAlgorithmParameterException {
 
@@ -198,8 +230,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         return customer;
     }
 
-    private final ScheduleManageMapper scheduleManageMapper;
-
     @Override
     public Customer authorizedPhone(String token, String encryptedData, String iv) throws InvalidAlgorithmParameterException {
         GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
@@ -258,11 +288,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         }
     }
 
-    private final CustomerDetailMapper customerDetailMapper;
-    private final CustomerBalanceMapper customerBalanceMapper;
-
-    private final QRCodeService qrCodeService;
-
     @Override
     public Customer getUserInfo(String token) throws Exception {
         GogirlToken gogirlToken = gogirlTokenService.getByToken(token);
@@ -286,13 +311,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         return customer;
     }
 
-    private final StoreManageMapper storeManageMapper;
-    private final OrderManageMapper orderManageMapper;
-
-    private final OrderServeMapper orderServeMapper;
-    private final BaseServeMapper baseServeMapper;
-    private final OrderRecordMapper orderRecordMapper;
-
     @Override
     public CustomerOrderDetail queryCustomerDetail(Integer customerId, Integer orderId) {
 
@@ -334,9 +352,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         return customerOrderDetail;
     }
 
-    private final CustomerDetailService customerDetailService;
-    private final OrderManageService orderManageService;
-
     @Override
     public void updateCustomerDetail(Integer birthdayMonth, Integer birthdayDay, String ageGroup, Integer customerId, Integer orderId, Integer orderServeId, String storeRecordRealName, String sex, Integer age, String job, String preference, String character, Integer customerSource) {
 
@@ -377,8 +392,6 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
         }
     }
 
-    private final GogirlConfigMapper gogirlConfigMapper;
-
     @Override
     public List<String> getAgeGroups() {
         GogirlConfig gogirlConfig = gogirlConfigMapper.selectByPrimaryKey(3);

src/main/java/com/gogirl/domain/order/serve/OrderManage.java

@@ -259,4 +259,7 @@ public class OrderManage implements Serializable {
     @TableField(exist = false)
     private List<TimesCardUsedRecord> listTimesCardRecord;
 
+    @ApiModelProperty("支付时间")
+    private Date payTime;
+
 }

src/main/java/com/gogirl/interfaces/store/career/TechScoreRulesController.java → src/main/java/com/gogirl/interfaces/store/TechScoreRulesController.java

-package com.gogirl.interfaces.store.career;
+package com.gogirl.interfaces.store;
 
 
 import com.gogirl.application.store.career.ITechScoreRulesService;

src/main/java/com/gogirl/interfaces/user/TimesCardController.java

@@ -86,9 +86,7 @@ public class TimesCardController {
 
         //计算次卡的价钱
         BigDecimal sumAmount = tct.getPayAmount().multiply(new BigDecimal(tct.getSumTimes()));
-
         String outTradeNo = IdWorker.getIdStr();
-
         String attach = timesCardId + "," + gogirlToken.getCustomerId();
 
         //发起统一支付
@@ -108,7 +106,6 @@ public class TimesCardController {
                 .openid(gogirlToken.getOpenid())
                 .build();
 
-
         WxPayMpOrderResult result = wxPayControllerFeign.createJsapiOrder(request);
         return JsonResult.success(result);
     }