|
@@ -67,7 +67,7 @@ public class ShouhuoPay implements IMINAction{
|
|
|
public MINActionResult minCommmonPay(
|
|
|
@MINParam(key = "payAmt") String payAmt,
|
|
|
@MINParam(key = "orderId") String orderId,
|
|
|
- @MINParam(key = "payType", defaultValue = "00") String payType,
|
|
|
+ @MINParam(key = "payType", defaultValue = "WX") String payType,
|
|
|
MINSession session,
|
|
|
MINHttpServletRequestContext fapRequest
|
|
|
) throws Exception {
|
|
@@ -104,6 +104,7 @@ public class ShouhuoPay implements IMINAction{
|
|
|
orderId = DateUtil.getDifferentTimeByFormat("MMddHHmmss").concat(StringUtils.substring(orderId, 10));
|
|
|
ordInf.setId(orderId);
|
|
|
ordInf.setState("91");
|
|
|
+ ordInf.setPayMode(payType);
|
|
|
Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmOrderInfMapper.class).insert(ordInf);
|
|
|
//获取订单下的详情信息
|
|
|
VmOrderDetailsExample examp = new VmOrderDetailsExample();
|
|
@@ -157,6 +158,10 @@ public class ShouhuoPay implements IMINAction{
|
|
|
paymentInf.setTranmissiondatetime(DateUtil.getCurrentDateTimeString());
|
|
|
Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmPaymentInfMapper.class).updateByExampleSelective(paymentInf, paymentExp);
|
|
|
}
|
|
|
+ }else{
|
|
|
+ //修改支付方式
|
|
|
+ ordInf.setPayMode(payType);
|
|
|
+ Service.lookup(IMINDataBaseService.class).getMybatisMapper(VmOrderInfMapper.class).updateByPrimaryKeySelective(ordInf);
|
|
|
}
|
|
|
Map<String, Object> resMap = null;
|
|
|
try {
|
|
@@ -444,7 +449,7 @@ public class ShouhuoPay implements IMINAction{
|
|
|
if("01".equals(orderInf.getProType())){
|
|
|
//抽奖的商品走这里
|
|
|
OrderDrawAction drawAction = new OrderDrawAction();
|
|
|
- drawAction.editOrderDraw(orderInf);
|
|
|
+ drawAction.editOrderDraw(orderInf,sysorderno);
|
|
|
}else if("00".equals(orderInf.getProType())){
|
|
|
//购买商品走这里
|
|
|
DeliveryAction.createDeliveryInfo(orderno,"");
|