浏览代码

付第三方bugfix

zhijiezhao 1 年之前
父节点
当前提交
f9f14ff488
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      src/main/java/com/caimei/modules/order/service/CmPayShopService.java

+ 5 - 1
src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -970,12 +970,16 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         NewShopOrder shopOrder = newShopOrderDao.findByShopOrderID(payShopOther.getShopOrderId());
         CmPayShop payShop = new CmPayShop();
         payShop.setShopID(shopOrder.getShopID().toString());
+        payShop.setName(payShopOther.getName());
         if (2 != payShopOther.getPayType()) {
-            payShop.setName(payShopOther.getName());
             payShop.setBankAccountName(payShopOther.getBankAccountName());
             payShop.setBankAccount(payShopOther.getBankAccount());
             payShop.setBankName(payShopOther.getBankName());
             payShop.setType(payShopOther.getType().toString());
+        }else{
+            String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+            payShop.setApplyTime(format);
+            payShop.setReviewTime(format);
         }
         payShop.setTotalAmount(payShopOther.getShopOtherFee().doubleValue());
         payShop.setBalancePayFee(0d);