czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
This commit is contained in:
Tankaikai
2024-11-19 14:13:59 +08:00
parent 5eb1403647 55adcacc4c
commit df5215a876
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -1299,6 +1299,9 @@ public class PayService {
orderInfo.setPaidTime(System.currentTimeMillis()); orderInfo.setPaidTime(System.currentTimeMillis());
tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo); tbOrderInfoMapper.updateByPrimaryKeySelective(orderInfo);
// 消费送积分
tbMemberPointsService.consumeAwardPoints(Long.valueOf(orderInfo.getMemberId()), Long.valueOf(orderInfo.getId()));
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("token", 0); jsonObject.put("token", 0);
jsonObject.put("type", "wxcreate"); jsonObject.put("type", "wxcreate");

7
src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
View File

@@ -257,7 +257,12 @@ public class ProductService {
//热销 //热销
TbProductGroup hot = new TbProductGroup(); TbProductGroup hot = new TbProductGroup();
hot.setName("热销"); hot.setName("热销");
List<TbProduct> hots = tbProductMapper.selectHot(shopId,proSets); List<TbProduct> hots = null;
if (proSets.isEmpty()) {
hots = new ArrayList<>();
}else {
hots = tbProductMapper.selectHot(shopId,proSets);
}
hot.setProducts(handleDate(hots,true,1,false, shopInfo)); hot.setProducts(handleDate(hots,true,1,false, shopInfo));
groupList.add(0, hot); groupList.add(0, hot);