bug修复

farm-sankin-biz/src/main/java/jp/yamoto/farm/sankin/biz/service/impl/MastItemServiceImpl.java

@@ -65,7 +65,7 @@ public class MastItemServiceImpl implements IMastItemService {
     public MastItemVo selectById(String id) {
         MastItemVo mastItemVo = mastItemMapper.selectById(id, SecurityUtils.getLoginUser().getUsername());
         if(ValueUtils.isNotEmpty(mastItemVo)){
-            mastItemVo.setImages(mastItemMapper.selectItemImageList(mastItemVo.getItemId()));
+            mastItemVo.setImages(mastItemMapper.selectItemImageList(mastItemVo.getId()));
 
             // 梱包まとめタイプ
             if(ValueUtils.isNotEmpty(mastItemVo.getAckagingFlg())){

farm-sankin-biz/src/main/resources/mapper/BssOrderMapper.xml

@@ -43,8 +43,8 @@
             bss_order bo
         LEFT JOIN sys_dict_data sdd on sdd.dict_value = bo.status and sdd.dict_type = 'bss_order_status'
         LEFT JOIN sys_dict_data sdd1 on sdd1.dict_value = bo.dlvdelivery_flg and sdd1.dict_type = 'bss_dlvdelivery_flg'
-        LEFT JOIN bss_order_delivery_item bodi ON bo.order_id = bodi.order_id
-        LEFT JOIN bss_order_delivery bod on bo.order_id = bod.order_id and  bodi.delivery_id = bod.id
+        LEFT JOIN bss_order_delivery bod on bod.order_id = bo.order_id
+        LEFT JOIN bss_order_delivery_item bodi ON bodi.order_id = bo.order_id and  bodi.delivery_id = bod.id
         <where>
             bo.farmer_id = #{farmerId}
             <if test="status != null  and status != ''">

farm-sankin/src/main/resources/i18n/messages.properties

@@ -71,6 +71,7 @@ EM005={0}\u306F{1}\u6587\u5B57\u4EE5\u4E0B\u3067\u5165\u529B\u3057\u3066\u304F\u
 EM006={0}\u304C\u4E0D\u6B63\u3067\u3059\u3002
 EM007=\u6697\u53F7\u5316\u30A8\u30E9\u30FC\u3002
 EM008=\u5FA9\u53F7\u30A8\u30E9\u30FC\u3002
+EM009=\u8A72\u5F53\u30C7\u30FC\u30BF\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002
 
 I0001=\u6210\u529F\u3057\u307E\u3057\u305F\u3002
 I0002=\u5931\u6557\u3057\u307E\u3057\u305F\u3002