clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
HH 2022-06-06 11:12:00 +08:00
parent b688f0f525 f698f94c6a
commit 830f8136cc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java
View File

@ -28,7 +28,7 @@ import java.util.Set;
*/
@Slf4j
@Controller
@RequestMapping("customer/bankcard")
@RequestMapping("/customer/bankcard")
public class CustomerBankController {
@Resource

3
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
View File

@ -28,6 +28,7 @@ import com.ghy.worker.service.WorkerService;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@ -88,7 +89,7 @@ public class OrderMasterController extends BaseController {
OrderGoods orderGoods = orderGoodsService.selectByOrderMasterId(master.getId());
// 添加商品信息
if(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId())!=null){
if(!CollectionUtils.isEmpty(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId()))){
orderGoods.setGoodsStandard(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId()).get(0));
}