支付金额小于0判断

order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -57,12 +57,8 @@ import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
 import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
-import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
-import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
-import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.enums.*;
 import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq;
-import com.freemud.application.sdk.api.ordercenter.enums.RefundModeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
 import com.freemud.application.sdk.api.ordercenter.request.POSOrderOperationBaseReq;
@@ -376,6 +372,10 @@ public class MallOrderServiceImpl implements MallOrderService {
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
+            orderPayResponse.setPayMode(PayChannelType.WECHAT.getEbcode());
+            if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
+                orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
+            }
             return orderPayResponse;
         } catch (Exception e) {
             LogUtil.error("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
@@ -403,6 +403,11 @@ public class MallOrderServiceImpl implements MallOrderService {
                 JSONObject.toJSONString(orderExtInfo));
         orderEditRequest.setOrderId(orderBean.getOid());
         orderEditRequest.setTrackingNo(trackingNo);
+        if (orderPayResponse.getPayMode() != null) {
+            orderEditRequest.setPayChannel(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getEbcode());
+            orderEditRequest.setPayChannelName(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getName());
+            orderEditRequest.setPayChannelType(PayChannelType.getByEbcode(orderPayResponse.getPayMode()).getIndex());
+        }
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderEdit(orderEditRequest);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS, baseOrderResponse.getErrcode())) {
             CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java

@@ -515,7 +515,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         UserLoginInfoDto userLoginInfoDto = convert2UserLoginInfoDto(assortmentCustomerInfoVo);
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
-        String appId = shoppingCartInfoRequestVo.getAppId();
+        String appId = StringUtils.isEmpty(shoppingCartInfoRequestVo.getAppId())?userLoginInfoDto.getWxAppid():shoppingCartInfoRequestVo.getAppId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String couponCode = shoppingCartInfoRequestVo.getCouponCode();
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();