魏熙美 6 years ago
parent
commit
399dd3737f

+ 2
- 2
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java View File

486
 
486
 
487
 
487
 
488
 		userLicenseOrderList.forEach(e-> {
488
 		userLicenseOrderList.forEach(e-> {
489
-			e.setPaymentType(pay_type);
490
 			UserElement userElement = new UserElement();
489
 			UserElement userElement = new UserElement();
491
 			userElement.setCommunityId(e.getCommunityId());
490
 			userElement.setCommunityId(e.getCommunityId());
492
 			userElement.setId(e.getTaUserId());
491
 			userElement.setId(e.getTaUserId());
498
 				e.setExpireDate(taUserLicense.getExpireDate());
497
 				e.setExpireDate(taUserLicense.getExpireDate());
499
 			}
498
 			}
500
 			e.setPaymentType(pay_type);
499
 			e.setPaymentType(pay_type);
501
-
500
+			e.setUpdateUser(e.getCreateUser());
501
+			e.setUpdateDate(new Date());
502
 			taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
502
 			taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
503
 
503
 
504
 		});
504
 		});

+ 1
- 0
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserLicenseOrderServiceImpl.java View File

52
         queryWrapper.like(StringUtils.isNotBlank(paymentName), "payment_name", paymentName);
52
         queryWrapper.like(StringUtils.isNotBlank(paymentName), "payment_name", paymentName);
53
         queryWrapper.like(StringUtils.isNotBlank(paymentTel), "payment_tel", paymentTel);
53
         queryWrapper.like(StringUtils.isNotBlank(paymentTel), "payment_tel", paymentTel);
54
         queryWrapper.eq("community_id", userElement.getCommunityId());
54
         queryWrapper.eq("community_id", userElement.getCommunityId());
55
+        queryWrapper.orderByDesc("create_date");
55
 
56
 
56
         IPage<TaUserLicenseOrder> orderIPage = this.page(page, queryWrapper);
57
         IPage<TaUserLicenseOrder> orderIPage = this.page(page, queryWrapper);
57
         responseBean.addSuccess(orderIPage);
58
         responseBean.addSuccess(orderIPage);