朋友代付

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -833,14 +833,16 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         else {
             throw new RRException("不支持的收款方式");
         }
-
+        //支付时间
         orderManage.setPayTime(new Date());
         //支付用户等于下单用户
         orderManage.setPayUser(orderManage.getOrderUser());
+        //非朋友代付
+        orderManage.setIsFriendPay(2);
         //发送订阅消息
         subscribeService.sendPaySuccessMsg(orderId, customer.getOpenid1(), payTypeStr, new Date(), orderManage.getTotalPaymentAmount(), new BigDecimal(customerBalance.getBalance() / 100));
-        this.updateById(orderManage);
 
+        this.updateById(orderManage);
     }
 
     @Resource
@@ -869,7 +871,10 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         orderManage.setUpdateTime(new Date());
 
         Customer payCustomer = customerService.getByOpenid1(result.getOpenid());
+        //支付用户
         orderManage.setPayUser(payCustomer.getId());
+        //是否朋友支付
+        orderManage.setIsFriendPay(payCustomer.getId().equals(orderManage.getOrderUser()) ? 2 : 1);
         this.updateById((orderManage));
 
 
@@ -920,13 +925,17 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
         //支付方式
         orderManage.setPaymentType(OrderManage.PAYMENT_WX);
+        //支付时间
         orderManage.setPayTime(new Date());
+        //更新时间
         orderManage.setUpdateTime(new Date());
 
         //支付用户
         Customer customer = customerService.getByOpenid1(result.getOpenid());
+        //支付用户
         orderManage.setPayUser(customer.getId());
-
+        //是否朋友代付
+        orderManage.setIsFriendPayByPayUserAndOrderUser();
         this.updateById(orderManage);
 
         /*2.更新卡券状态*/

src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java

@@ -73,17 +73,20 @@ public class PayServiceImpl implements PayService {
                 .build();
         customerBalanceService.consumer(consumerCmd);
 
-        /*step2.更新订单*/
+        /*2、更新订单*/
         orderManage.setRemark("余额支付");
         orderManageService.updateById(orderManage);
 
-
+        //支付时间
         orderManage.setPayTime(new Date());
+        //支付方式
         orderManage.setPaymentType(OrderManage.PAYMENT_BALANCE);
+        //状态待评价
         orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
-
         //支付用户
         orderManage.setPayUser(currentCustomerId);
+        //是否代付
+        orderManage.setIsFriendPayByPayUserAndOrderUser();
 
         orderManageService.updateById(orderManage);
 
@@ -94,7 +97,6 @@ public class PayServiceImpl implements PayService {
     }
 
 
-
     @Override
     public WxPayMpOrderResult unifiedOrder(UnifiedOrderQuery qry) throws UnknownHostException, WxPayException {
 

src/main/java/com/gogirl/domain/order/serve/OrderManage.java

@@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
 import com.gogirl.domain.market.coupon.CouponOrderRelevance;
 import com.gogirl.domain.market.timescard.TimesCardUsedRecord;
-import com.gogirl.domain.store.store.StoreUser;
 import com.gogirl.domain.user.customer.Customer;
 import com.gogirl.domain.user.customer.CustomerBalanceRecord;
 import io.swagger.annotations.ApiModel;
@@ -264,6 +263,7 @@ public class OrderManage implements Serializable {
     @ApiModelProperty("支付时间")
     private Date payTime;
 
+    @ApiModelProperty("支付用户")
     private Integer payUser;
 
     @ApiModelProperty("是否朋友代付 1-是 2-否")
@@ -278,4 +278,7 @@ public class OrderManage implements Serializable {
     private Integer isSendCommentMsg;
 
 
+    public void setIsFriendPayByPayUserAndOrderUser() {
+        this.isFriendPay = payUser.equals(orderUser) ? 2 : 1;
+    }
 }