|
@@ -835,8 +835,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
|
|
|
newShopOrderDao.update(shopOrder);
|
|
|
record.setStatus("0");
|
|
|
record.setPayTime(DateUtils.formatDateTime(new Date()));
|
|
|
-// record.setPayType(null);
|
|
|
-// log.info("打印========================》"+ record.getPayType());
|
|
|
+ record.setPayType(cmPayShop.getPayType());
|
|
|
cmPayShopRecordDao.update(record);
|
|
|
|
|
|
// 还原主订单的状态 ----
|
|
@@ -874,7 +873,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
|
|
|
records.forEach(record -> {
|
|
|
record.setStatus("0");
|
|
|
record.setPayTime(DateUtils.formatDateTime(new Date()));
|
|
|
-// record.setPayType(cmPayShop.getPayType());
|
|
|
+ record.setPayType(cmPayShop.getPayType());
|
|
|
cmPayShopRecordDao.update(record);
|
|
|
});
|
|
|
cmPayShop.setStatus("0");
|