| @@ -40,7 +40,12 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { | |||||
| public WxAppinfo getCAppInfo(TenantEntity tenantEntity,EnumPayWay payWay) { | public WxAppinfo getCAppInfo(TenantEntity tenantEntity,EnumPayWay payWay) { | ||||
| WxAppinfo appInfo = null; | WxAppinfo appInfo = null; | ||||
| WxAppinfo appinfoQ = new WxAppinfo(); | WxAppinfo appinfoQ = new WxAppinfo(); | ||||
| appinfoQ.setPlat(payWay.getPlat().getCode()); | |||||
| if (null == payWay.getPlat()) { | |||||
| appinfoQ.setPlat(EnumPayWay.PAY_WAY_WECHAT.getPlat().getCode()); | |||||
| }else { | |||||
| appinfoQ.setPlat(payWay.getPlat().getCode()); | |||||
| } | |||||
| appinfoQ.updateTenantInfo(tenantEntity); | appinfoQ.updateTenantInfo(tenantEntity); | ||||
| appinfoQ.setType(EnumAppType.C.getCode()); | appinfoQ.setType(EnumAppType.C.getCode()); | ||||
| List<WxAppinfo> appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); | List<WxAppinfo> appList = wxAppinfoMapper.selectList(new QueryWrapper(appinfoQ)); | ||||
| @@ -621,6 +621,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); | WxMerchantSubsidy subsidy = new WxMerchantSubsidy(); | ||||
| subsidy.setOrderId(couponOrder.getOrderId()); | subsidy.setOrderId(couponOrder.getOrderId()); | ||||
| subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); | subsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); | ||||
| subsidy.updateTenantInfo(couponOrder); | |||||
| List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); | List<WxMerchantSubsidy> wmsList = wxMerchantSubsidyMapper.selectList(new QueryWrapper(subsidy)); | ||||
| if (wmsList.size() > 0) { | if (wmsList.size() > 0) { | ||||
| logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); | logger.error("补贴已经入库: (orderId,type)-({},1)", couponOrder.getOrderId()); | ||||
| @@ -1575,7 +1575,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| try { | try { | ||||
| stockBack(updateOrder); | stockBack(updateOrder); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("库存+1失败, e:" + e.getMessage()); | |||||
| logger.error("库存+1失败, e:" + e.getMessage(),e); | |||||
| throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); | throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); | ||||
| } | } | ||||
| break; | break; | ||||
| @@ -1586,11 +1586,12 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| refOrder.setId(updateOrder.getId()); | refOrder.setId(updateOrder.getId()); | ||||
| refOrder.setOrderStatus(enumOrderStatus.getCode()); | refOrder.setOrderStatus(enumOrderStatus.getCode()); | ||||
| refOrder.setUpdateDate(currentDate); | refOrder.setUpdateDate(currentDate); | ||||
| refOrder.updateTenantInfo(updateOrder); | |||||
| int ret = 0; | int ret = 0; | ||||
| try { | try { | ||||
| ret = wxOrderMapper.updateById(refOrder); | ret = wxOrderMapper.updateById(refOrder); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("订单状态更新失败, e:" + e.getMessage()); | |||||
| logger.error("订单状态更新失败, e:" + e.getMessage(),e); | |||||
| throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR); | throw new MallinkException(ErrorCode.ORDER_UPDATE_ERR); | ||||
| } | } | ||||
| return ret; | return ret; | ||||
| @@ -531,7 +531,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| wxOrderService.updateOrderStatus(order, EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); | wxOrderService.updateOrderStatus(order, EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); | ||||
| } | } | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage()); | |||||
| logger.error(e.getMessage(),e); | |||||
| throw new MallinkException(ErrorCode.DB_FAIL); | throw new MallinkException(ErrorCode.DB_FAIL); | ||||
| } | } | ||||
| @@ -63,6 +63,15 @@ public class PayServiceFactory { | |||||
| shareMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxShareService); | shareMap.put(EnumPayWay.PAY_WAY_WECHAT.getCode(), wxShareService); | ||||
| shareMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxShareService); | shareMap.put(EnumPayWay.PAY_WAY_WECHAT_MA.getCode(), wxShareService); | ||||
| shareMap.put(EnumPayWay.PAY_WAY_POS_NEU.getCode(), wxShareService); | shareMap.put(EnumPayWay.PAY_WAY_POS_NEU.getCode(), wxShareService); | ||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_MERCHANT.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_VERRIFY.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_B_MA.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CAR_STOP.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_SYSTEM_SEND.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_BATCH_SEND.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_TRADE.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD.getCode(), wxShareService); | |||||
| shareMap.put(EnumPayWay.PAY_WAY_NOT_UNPAY_CREDIT.getCode(), wxShareService); | |||||
| } | } | ||||
| return shareMap; | return shareMap; | ||||
| } | } | ||||