ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit b01d5c9ccb3559c9f9b0ff2968545a90aa74f552 2 parents b3bc36ec a486f64f

Merge branch 'hotfix1211buyerorderTimeout' into test6.8.3

Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
@@ -174,7 +174,7 @@ public class ProductServiceImpl implements ProductService{ @@ -174,7 +174,7 @@ public class ProductServiceImpl implements ProductService{
174 Goods goods = goodsMapper.selectByPrimaryKey(storage.getGoodsId()); 174 Goods goods = goodsMapper.selectByPrimaryKey(storage.getGoodsId());
175 if (goods != null) { 175 if (goods != null) {
176 resp.setColorId(goods.getColorId().toString()); 176 resp.setColorId(goods.getColorId().toString());
177 - resp.setColorName(goods.getColorName()); 177 + resp.setColorName(StringUtils.isEmpty(goods.getGoodsName()) ? goods.getColorName() : goods.getGoodsName());
178 resp.setImageUrl(goods.getColorImage()); 178 resp.setImageUrl(goods.getColorImage());
179 179
180 Product product = productMapper.selectByPrimaryKey(goods.getProductId()); 180 Product product = productMapper.selectByPrimaryKey(goods.getProductId());