Sfoglia il codice sorgente

删除无效引用,余额支付优化报错信息

codingliang 1 anno fa
parent
commit
d0516ffae3

+ 5 - 35
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java

@@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxpay.sdk.WXPay;
 import com.github.wxpay.sdk.WXPayConstants;
 import com.github.wxpay.sdk.WXPayUtil;
+import com.sqx.common.exception.SqxException;
 import com.sqx.common.utils.Result;
-import com.sqx.modules.address.dao.AddressDao;
 import com.sqx.modules.app.dao.UserDao;
 import com.sqx.modules.app.dao.UserMoneyDetailsDao;
 import com.sqx.modules.app.entity.UserEntity;
@@ -17,28 +17,20 @@ import com.sqx.modules.app.service.UserMoneyService;
 import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.common.entity.CommonInfo;
 import com.sqx.modules.common.service.CommonInfoService;
-import com.sqx.modules.coupon.dao.TbCouponUserDao;
-import com.sqx.modules.coupon.service.TbCouponUserService;
 import com.sqx.modules.datacentre.service.DataCentreService;
 import com.sqx.modules.errand.entity.TbIndent;
 import com.sqx.modules.errand.service.TbIndentService;
 import com.sqx.modules.goods.dao.GoodsShopDao;
-import com.sqx.modules.goods.dao.GoodsShopRelevancyDao;
-import com.sqx.modules.goods.dao.GoodsSkuDao;
 import com.sqx.modules.goods.entity.GoodsShop;
-import com.sqx.modules.goods.service.GoodsService;
-import com.sqx.modules.message.dao.MessageInfoDao;
 import com.sqx.modules.order.dao.AppOrderDao;
-import com.sqx.modules.order.dao.OrderGoodsDao;
 import com.sqx.modules.order.entity.TbOrder;
 import com.sqx.modules.order.service.AppOrderService;
-import com.sqx.modules.pay.dto.PayOrderDTO;
 import com.sqx.modules.pay.config.WXConfig;
 import com.sqx.modules.pay.controller.app.AliPayController;
 import com.sqx.modules.pay.dao.PayDetailsDao;
+import com.sqx.modules.pay.dto.PayOrderDTO;
 import com.sqx.modules.pay.entity.PayDetails;
 import com.sqx.modules.pay.service.WxService;
-import com.sqx.modules.shop.service.ShopMessageService;
 import com.sqx.modules.utils.AmountCalUtils;
 import com.sqx.modules.utils.MD5Util;
 import com.sqx.modules.utils.WXConfigUtil;
@@ -64,7 +56,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 public class WxServiceImpl implements WxService {
     private static final String SPBILL_CREATE_IP = "127.0.0.1";
     private static final String TRADE_TYPE_APP = "APP";
-    private static final String TRADE_TYPE_NATIVE = "NATIVE";
     private static final String TRADE_TYPE_JSAPI = "JSAPI";
 
     @Autowired
@@ -83,23 +74,9 @@ public class WxServiceImpl implements WxService {
     @Autowired
     private UserMoneyService userMoneyService;
     @Autowired
-    private TbCouponUserService tbCouponUserService;
-    @Autowired
     private UserMoneyDetailsDao userMoneyDetailsDao;
     @Autowired
     private GoodsShopDao goodsShopDao;
-    @Autowired
-    private AddressDao addressDao;
-    @Autowired
-    private GoodsSkuDao goodsSkuDao;
-    @Autowired
-    private OrderGoodsDao orderGoodsDao;
-    @Autowired
-    private TbCouponUserDao tbCouponUserDao;
-    @Autowired
-    private MessageInfoDao messageInfoDao;
-    @Autowired
-    private GoodsShopRelevancyDao goodsShopRelevancyDao;
     @Lazy
     @Autowired
     private DataCentreService dataCentreService;
@@ -111,11 +88,6 @@ public class WxServiceImpl implements WxService {
     private TbIndentService indentService;
     @Autowired
     private UserMoneyDetailsService userMoneyDetailsService;
-    @Lazy
-    @Autowired
-    private GoodsService goodsService;
-    @Autowired
-    private ShopMessageService shopMessageService;
 
     private ReentrantReadWriteLock reentrantReadWriteLock=new ReentrantReadWriteLock(true);
 
@@ -126,13 +98,11 @@ public class WxServiceImpl implements WxService {
         reentrantReadWriteLock.writeLock().lock();
         try{
             return balanceOrders(userId, payOrderDTO);
-        }catch (Exception e){
-            e.printStackTrace();
-            log.error("下单异常:"+e.getMessage(),e);
-        }finally {
+        } catch (Exception e){
+            throw new SqxException(e.getMessage());
+        } finally {
             reentrantReadWriteLock.writeLock().unlock();
         }
-        return Result.error("系统繁忙,请稍后再试!");
     }
 
     /**