dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source 
# Conflicts:
#	fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
This commit is contained in:
DESKTOP-369JRHT\12997 2024-06-03 09:12:52 +08:00
commit 8bcf58ca2b
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
View File

@ -237,7 +237,6 @@ public class IntegralGiftServiceImpl implements IntegralGiftService {
}finally { }finally {
redisLock.unlock(lockKey); redisLock.unlock(lockKey);
} }
} }
return true; return true;
} }

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
View File

@ -113,5 +113,12 @@ public class CardValueOrdersController extends BaseController {
String status = map.get("status"); String status = map.get("status");
cardValueOrdersService.updateOrderStatus(orderNo,status); cardValueOrdersService.updateOrderStatus(orderNo,status);
} }
@PostMapping("getOneByOrderNo")
public void getOneByOrderNo(@RequestBody Map<String,String> map){
String orderNo = map.get("orderNo");
cardValueOrdersService.getOneByOrderNo(orderNo);
}
} }

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/OilTagController.java
View File

@ -68,7 +68,11 @@ public class OilTagController extends BaseController {
} }
// queryWrapper.eq(OilTag::getDeptId,nowAccountInfo.getDeptId()); // queryWrapper.eq(OilTag::getDeptId,nowAccountInfo.getDeptId());
// FIND_IN_SET // FIND_IN_SET
if (100!=nowAccountInfo.getDeptId()){
queryWrapper.apply("FIND_IN_SET('" + nowAccountInfo.getDeptId() + "', dept_ids)"); queryWrapper.apply("FIND_IN_SET('" + nowAccountInfo.getDeptId() + "', dept_ids)");
//queryWrapper.eq(OilTag::getDeptId,nowAccountInfo.getDeptId());
}
//queryWrapper.apply("FIND_IN_SET('" + nowAccountInfo.getDeptId() + "', dept_ids)");
if (ObjectUtils.isNotEmpty(oilTag.getSnCode())){ if (ObjectUtils.isNotEmpty(oilTag.getSnCode())){
queryWrapper.eq(OilTag::getSnCode,oilTag.getSnCode()); queryWrapper.eq(OilTag::getSnCode,oilTag.getSnCode());