Commit c17e6990e4bcd5fa8615c1ce3ac017c6472b9dae

Authored by huanggang
2 parents cbaeeb87 783c7640

Merge branch 'main' of git3.nong12.com:cashierdesk/dili-cashier

cashier-mall/src/main/java/com/diligrp/cashier/mall/service/biz/impl/MallBizOrderServiceImpl.java
... ... @@ -19,6 +19,7 @@ import com.diligrp.cashier.mall.service.biz.MallBizPaymentService;
19 19 import com.diligrp.cashier.mall.type.OrderState;
20 20 import com.diligrp.cashier.mall.type.OrderType;
21 21 import com.diligrp.cashier.mall.type.RtMarkErrorCode;
  22 +import com.diligrp.cashier.pipeline.type.CashierType;
22 23 import com.diligrp.cashier.shared.domain.BaseDO;
23 24 import com.diligrp.cashier.shared.spi.ICashierDeskManager;
24 25 import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
... ... @@ -253,7 +254,7 @@ public class MallBizOrderServiceImpl implements MallBizOrderService {
253 254 CashierOrderBO cashierOrderBO = new CashierOrderBO();
254 255 cashierOrderBO.setMchId(Long.valueOf(mallBizPayment.getMchId()));
255 256 cashierOrderBO.setUserId(mallBizPayment.getUserCode());
256   - cashierOrderBO.setCashierType(2);
  257 + cashierOrderBO.setCashierType(CashierType.MINIPRO.getCode());
257 258 cashierOrderBO.setAmount(mallBizPayment.getPayFee());
258 259 cashierOrderBO.setOutTradeNo(mallBizPayment.getPayTradeNo());
259 260 // 支付成功跳转页面
... ...