|
@@ -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);
|